Download as
Browse Code »

Commit e6634cb3c0149dbb78c0a2783ce8bc49572d915b

Authored by Marcos Pereira
1 parent 3a7f4830
Exists in send_email_to_admins and in 5 other branches add_member_task_reject_details, fix_sign_up_form, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes

Refactors processed task filter fields 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Showing 1 changed file with 6 additions and 5 deletions   Show diff stats
app/views/tasks/processed.html.erb
  Diff comments   View file @e6634cb
... ... @@ -6,21 +6,22 @@
6 6 <div class="task-processed-filter">
7 7 <%
8 8 type_collection = [[nil, _('All')]] + @task_types
  9 + type_collection.map!{|first,last| [last,first]}
9 10 %>
10 11 <%= form_tag '#', :method => 'get' do %>
11 12 <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
12 13 <div>
13   - <%= labelled_select(_('Type of task')+': ', 'filter[type]', :first, :last, @filter[:type], type_collection, {:id => 'filter-type'}) %>
14   - <%= 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] ]) %>
  14 + <%= labelled_form_field(_('Type of task')+': ', select_tag('filter[type]', options_for_select(type_collection, @filter[:type]), {:id => 'filter-type'})) %>
  15 + <%= 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]))) %>
15 16 </div>
16 17  
17 18 <div>
18   - <%= labelled_text_field(_('Text Filter:'), 'filter[text]', @filter[:text]) %>
  19 + <%= labelled_form_field(_('Text Filter:'), text_field_tag('filter[text]', @filter[:text])) %>
19 20 </div>
20 21  
21 22 <div>
22   - <%= labelled_text_field(_('Requestor:'), 'filter[requestor]', @filter[:requestor]) %>
23   - <%= labelled_text_field(_('Closed by:'), 'filter[closed_by]', @filter[:closed_by]) %>
  23 + <%= labelled_form_field(_('Requestor:'), text_field_tag('filter[requestor]', @filter[:requestor])) %>
  24 + <%= labelled_form_field(_('Closed by:'), text_field_tag('filter[closed_by]', @filter[:closed_by])) %>
24 25 </div>
25 26 <%= 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' })) %>
26 27 <%= 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' })) %>
... ...