From e6634cb3c0149dbb78c0a2783ce8bc49572d915b Mon Sep 17 00:00:00 2001
From: Marcos Ronaldo <marcos.rpj2@gmail.com>
Date: Tue, 19 Apr 2016 16:38:45 -0300
Subject: [PATCH] Refactors processed task filter fields

---
 app/views/tasks/processed.html.erb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/tasks/processed.html.erb b/app/views/tasks/processed.html.erb
index 6c7773b..d331f68 100644
--- a/app/views/tasks/processed.html.erb
+++ b/app/views/tasks/processed.html.erb
@@ -6,21 +6,22 @@
 <div class="task-processed-filter">
 <%
   type_collection = [[nil, _('All')]] + @task_types
+  type_collection.map!{|first,last| [last,first]}
 %>
   <%= form_tag '#', :method => 'get' do %>
     <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
       <div>
-        <%= labelled_select(_('Type of task')+': ', 'filter[type]', :first, :last, @filter[:type],  type_collection, {:id => 'filter-type'}) %>
-        <%= labelled_select(_('Status:'), 'filter[status]', :last, :first, @filter[:status], [[_('Any'), nil], [_(Task::Status.names[Task::Status::CANCELLED]), 2], [_(Task::Status.names[Task::Status::FINISHED]), 3] ]) %>
+        <%= labelled_form_field(_('Type of task')+': ', select_tag('filter[type]', options_for_select(type_collection, @filter[:type]), {:id => 'filter-type'})) %>
+        <%= labelled_form_field(_('Status')+': ', select_tag('filter[status]', options_for_select([[_('Any'), nil], [_(Task::Status.names[Task::Status::CANCELLED]), 2], [_(Task::Status.names[Task::Status::FINISHED]), 3] ], @filter[:status]))) %>
       </div>
 
       <div>
-        <%= labelled_text_field(_('Text Filter:'), 'filter[text]', @filter[:text]) %>
+        <%= labelled_form_field(_('Text Filter:'), text_field_tag('filter[text]', @filter[:text])) %>
       </div>
 
       <div>
-        <%= labelled_text_field(_('Requestor:'), 'filter[requestor]', @filter[:requestor]) %>
-        <%= labelled_text_field(_('Closed by:'), 'filter[closed_by]', @filter[:closed_by]) %>
+        <%= labelled_form_field(_('Requestor:'), text_field_tag('filter[requestor]', @filter[:requestor])) %>
+        <%= labelled_form_field(_('Closed by:'), text_field_tag('filter[closed_by]', @filter[:closed_by])) %>
       </div>
       <%= labelled_form_field(_('Creation date'), date_range_field('filter[created_from]', 'filter[created_until]', @filter[:created_from], @filter[:created_until], { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_created_from', :to_id => 'filter_created_until' })) %>
       <%= labelled_form_field(_('Processed date'), date_range_field('filter[closed_from]', 'filter[closed_until]', @filter[:closed_from], @filter[:closed_until], { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_closed_from', :to_id => 'filter_closed_until' })) %>
--
libgit2 0.21.2