Merge branch 'master' of https://gitlab.com/noosfero-plugins/proposals_discussion

Victor Costa
2 parents 34e1b1bd ed140de7
Showing 2 changed files with 7 additions and 4 deletions Show diff stats
lib/proposals_discussion_plugin/api.rb
lib/proposals_discussion_plugin/proposal_task.rb
 class ProposalsDiscussionPlugin::API < Grape::API
-  
   resource :proposals_discussion_plugin do
     paginate per_page: 10, max_per_page: 20
@@ -26,11 +25,11 @@ class ProposalsDiscussionPlugin::API &lt; Grape::API
     post ':id/propose' do
       sanitize_params_hash(params)
-      parent_article = environment.articles.find(params[:id])
+      parent_article = environment.articles.includes(:profile).find(params[:id])
       proposal_task = ProposalsDiscussionPlugin::ProposalTask.new
       proposal_task.article = params[:article]
-      proposal_task.article_parent_id = parent_article.id
+      proposal_task.article_parent = parent_article
       proposal_task.target = parent_article.profile
       proposal_task.requestor = current_person
@@ -129,8 +129,12 @@ class ProposalsDiscussionPlugin::ProposalTask &lt; Task
     requestor.name if requestor
   end
+  def article_parent=(parent)
+    @article_parent = parent
+  end
+
   def article_parent
-    Article.find_by_id article_parent_id.to_i
+    @article_parent ||= Article.find_by_id article_parent_id.to_i
   end
   def article_object