diff --git a/lib/proposals_discussion_plugin/proposal_task.rb b/lib/proposals_discussion_plugin/proposal_task.rb index b3cae12..14ae584 100644 --- a/lib/proposals_discussion_plugin/proposal_task.rb +++ b/lib/proposals_discussion_plugin/proposal_task.rb @@ -296,6 +296,10 @@ class ProposalsDiscussionPlugin::ProposalTask < Task categories.pluck(field).join(',') if categories.count > 0 end + def proposal_source + article[:name] + end + protected def require_category diff --git a/po/proposals_discussion.pot b/po/proposals_discussion.pot index 5b4cada..05db84f 100644 --- a/po/proposals_discussion.pot +++ b/po/proposals_discussion.pot @@ -408,3 +408,8 @@ msgstr "" #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:17 msgid "Assigned to:" msgstr "" + +#: plugins/proposals_discussion/views/tasks/_task.html.erb:3 +#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3 +msgid "Source" +msgstr "" diff --git a/po/pt/proposals_discussion.po b/po/pt/proposals_discussion.po index e5b17f3..089e12d 100644 --- a/po/pt/proposals_discussion.po +++ b/po/pt/proposals_discussion.po @@ -433,3 +433,8 @@ msgstr "Atribuído para:" #~ msgid "Max size: %s (.jpg, .gif, .png)" #~ msgstr "Tamanho máximo: %s (.jpg, .gif, .png)" + +#: plugins/proposals_discussion/views/tasks/_task.html.erb:3 +#: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3 +msgid "Source" +msgstr "Origem" diff --git a/public/style.css b/public/style.css index b19ddd9..f17c1af 100644 --- a/public/style.css +++ b/public/style.css @@ -392,3 +392,8 @@ div.confirm_evaluation_button a.disabled { color: rgb(77, 77, 77); font-weight: normal; } + +.task-proposal-source { + text-align: center; + color: #000 !important; +} diff --git a/test/unit/proposal_test.rb b/test/unit/proposal_test.rb index 877bfdc..78a278a 100644 --- a/test/unit/proposal_test.rb +++ b/test/unit/proposal_test.rb @@ -124,4 +124,19 @@ class ProposalTest < ActiveSupport::TestCase assert_equal [location], proposal.locations end + should 'check the source of a proposal in a task' do + + task_data = { + article: {name: "test proposal", abstract: "teste adadd"}, + requestor: person, + target: profile, + spam: false + } + + task = ProposalsDiscussionPlugin::ProposalTask.new task_data + + assert_equal task_data[:article][:name], task.proposal_source + + end + end diff --git a/views/proposals_discussion_plugin_tasks/_task.html.erb b/views/proposals_discussion_plugin_tasks/_task.html.erb index 48be169..8547295 100644 --- a/views/proposals_discussion_plugin_tasks/_task.html.erb +++ b/views/proposals_discussion_plugin_tasks/_task.html.erb @@ -1,4 +1,6 @@
+ +
<%= _('Source') %>: <%= task.proposal_source %>
<%= tag :a, name: "task-#{task.id}" %> <%= render :partial => 'task_icon', :locals => {:task => task} %> diff --git a/views/tasks/_task.html.erb b/views/tasks/_task.html.erb new file mode 100644 index 0000000..6ae1208 --- /dev/null +++ b/views/tasks/_task.html.erb @@ -0,0 +1,68 @@ +
+ +
<%= _('Source') %>: <%= task.proposal_source %>
+ <%= render :partial => 'task_icon', :locals => {:task => task} %> + + <% if !@view_only && profile.organization? && @responsible_candidates.present? %> +
+ <%= _('Assign to:') %> + + <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %> + <%= 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 %> + +
+ <% end %> + + <% if @view_only && task.responsible.present? %> +
+ <%= _('Assigned to:') %> + <%= task.responsible.name %> +
+ <% end %> + +
+ <% unless @view_only %> + <%= + labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept', + :id => "decision-finish-#{task.id}", + :class => 'task_accept_radio', + :disabled => task.accept_disabled?, + :task_id => "#{task.id}") + + labelled_radio_button(_("Reject"), "tasks[#{task.id}][decision]", 'cancel', task.default_decision == 'reject', + :id => "decision-cancel-#{task.id}", + :class => 'task_reject_radio', + :disabled => task.reject_disabled?, + :task_id => "#{task.id}") + + labelled_radio_button(_("Skip"), "tasks[#{task.id}][decision]", 'skip', task.default_decision == 'skip', + :id => "decision-skip-#{task.id}", + :class => 'task_skip_radio', + :disabled => task.skip_disabled?, + :task_id => "#{task.id}") + %> + <% end %> +
+ +
<%= show_time(task.created_at) %>
+ + <%= render :partial => 'task_title', :locals => {:task => task} %> + +
+ <%= task_information(task) %> +
+ + <%= fields_for "tasks[#{task.id}][task]", task do |f| %> + <% if task.accept_details %> + + <% end %> + + <% if task.reject_details %> + + <% end %> + + <% end %> + +
-- libgit2 0.21.2