Skip to content

Commit

Permalink
Merge nb/make-city-merges-easier
Browse files Browse the repository at this point in the history
commit 1802269045c87914a0ef8f31fb317de0374739d9
Author: Nick Barnwell <[email protected]>
Date:   Thu Apr 12 10:01:50 2018 -0700

    Make which city you're merging with clearer by adding user count
  • Loading branch information
Nick Barnwell committed Apr 12, 2018
1 parent 58b39ec commit 13a8e8d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/cities/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<%= label_tag(:approval_action_reject, "Reject City") %>
<%= radio_button_tag(:approval_action, "reject") %>
<div class="dropdown">
<%= select_tag(:merge_city_id, options_for_select(City.available.select(:id, :name).collect{ |p| [p.name, p.id] }, ""), {:class => "city"}) %>
<%= select_tag(:merge_city_id, options_for_select(City.available.select(:id, :name, :users_count).collect{ |p| ["#{p.name} - #{p.users_count} users", p.id] }, ""), {:class => "city"}) %>
</div>
<br/>
<% else %>
Expand Down

0 comments on commit 13a8e8d

Please sign in to comment.