Commit c293436c authored by Pedro Henrique's avatar Pedro Henrique

Merge branch 'Issue#130' into 'master'

Order occupation when searching for professional
Signed-off-by: Pedro Henrique's avatarPedro Henrique! <pha14@inf.ufpr.br>

See merge request !242
parents dd32fc54 2977b663
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
{:include_blank => "Todos"}, {:class => "search-field"} %> {:include_blank => "Todos"}, {:class => "search-field"} %>
<% else %> <% else %>
<%= f.select :occupation_id_eq, <%= f.select :occupation_id_eq,
options_from_collection_for_select(Occupation.where(city_hall_id: @currentCityHall.id),"id","name"), options_from_collection_for_select(Occupation.order(:name).where(city_hall_id: @currentCityHall.id),"id","name"),
{:include_blank => "Todos"}, {:class => "search-field"} %> {:include_blank => "Todos"}, {:class => "search-field"} %>
<% end %> <% end %>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment