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 @@