Download as
Browse Code »

Commit d0a7941b2066aad3eb12f85dd7a208a97adae115

Authored by Victor Costa
2 parents 9523fc5c 3b0b05ce
Exists in master and in 8 other branches avoid_duplicated_tasks, proposal_response, proposal_task_category, proposal_task_category_required, remove_escaped_html, restore_rejected_proposal, staging, tasks_keep_filter_params

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

Showing 2 changed files with 5 additions and 1 deletions   Show diff stats
controllers/myprofile/proposals_discussion_plugin_tasks_controller.rb
  Diff comments   View file @d0a7941
1 1 class ProposalsDiscussionPluginTasksController < TasksController
2 2  
  3 + protect [:perform_task, :view_tasks], :profile, :only => [:index, :save_tags, :search_tags, :save_categories]
  4 + protect :perform_task, :profile, :except => [:index, :save_tags, :search_tags, :save_categories]
  5 +
3 6 def index
4 7 @rejection_email_templates = profile.email_templates.find_all_by_template_type(:task_rejection)
5 8 @acceptance_email_templates = profile.email_templates.find_all_by_template_type(:task_acceptance)
... ...
lib/proposals_discussion_plugin/proposal_task.rb
  Diff comments   View file @d0a7941
... ... @@ -301,7 +301,8 @@ class ProposalsDiscussionPlugin::ProposalTask &lt; Task
301 301 end
302 302  
303 303 def proposal_source
304   - article_parent.name
  304 + parent = article_parent
  305 + parent.name if parent
305 306 end
306 307  
307 308 protected
... ...