Download as
Browse Code »

Commit 8419a785c55c9f7b7569646172c677402f360b46

Authored by Victor Costa
2 parents 35dde2bd a821b061
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'task_responsible' into production 

Conflicts:
	app/views/tasks/_task.html.erb
	app/views/tasks/index.html.erb
	public/stylesheets/tasks.css
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/tasks/_task.html.erb
  Diff comments   View file @8419a78
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 4
5 <% if profile.organization? && @responsible_candidates.present? %> 5 <% if profile.organization? && @responsible_candidates.present? %>
6 <div class="task_responsible"> 6 <div class="task_responsible">
7 - <span class="label"><%= _('Responsible:') %></span> 7 + <span class="label"><%= _('Assign to:') %></span>
8 <span> 8 <span>
9 <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %> 9 <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %>
10 <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %> 10 <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %>
app/views/tasks/index.html.erb
  Diff comments   View file @8419a78
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <%= labelled_text_field(_("Text filter")+': ', :filter_text, nil, {:id => 'filter-text',:value => @filter_text}) %> 30 <%= labelled_text_field(_("Text filter")+': ', :filter_text, nil, {:id => 'filter-text',:value => @filter_text}) %>
31 </p> 31 </p>
32 <p> 32 <p>
33 - <%= labelled_select(_('Responsible')+': ', :filter_responsible, :id, :name, @filter_responsible, [OpenStruct.new(:name => _('All'), :id => nil), OpenStruct.new(:name => _('Unassigned'), :id => -1)] + @responsible_candidates) %> 33 + <%= labelled_select(_('Assigned to')+': ', :filter_responsible, :id, :name, @filter_responsible, [OpenStruct.new(:name => _('All'), :id => nil), OpenStruct.new(:name => _('Unassigned'), :id => -1)] + @responsible_candidates) %>
34 </p> 34 </p>
35 <p> 35 <p>
36 <%= submit_button(:search, _('Search')) %> 36 <%= submit_button(:search, _('Search')) %>