Download as
Browse Code »

Commit 1db348b82e1aa60abc6679bb75225604e2e696c0

Authored by Marcos Pereira
Committed by Tallys Martins
1 parent 03744acd
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

WorkAssignment submissions visibility edition is now working for admins user 

- Refactored the name of the action to edit_visibility
- Refactored edit_visibility behavior to apply privacy to also the Folder's children
- Fixed bug on plugin content_viewer filter not passing the right path of article

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Showing 9 changed files with 59 additions and 48 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @1db348b
... ... @@ -30,7 +30,8 @@ class CmsController &lt; MyProfileController
30 30 (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
31 31 end
32 32  
33   - protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new] do |c, user, profile|
  33 + action_list = [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new]
  34 + protect_if :except => action_list do |c, user, profile|
34 35 user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
35 36 end
36 37  
... ... @@ -48,6 +49,8 @@ class CmsController &lt; MyProfileController
48 49 profile.articles.find(c.params[:id]).allow_edit?(user)
49 50 end
50 51  
  52 +
  53 +
51 54 def boxes_holder
52 55 profile
53 56 end
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @1db348b
... ... @@ -224,6 +224,12 @@ class Noosfero::Plugin
224 224 false
225 225 end
226 226  
  227 + # -> Add action names to a list of filtered actions on cms controller
  228 + # returns = []
  229 + def add_action_to_list
  230 + []
  231 + end
  232 +
227 233 # -> Adds buttons to the control panel
228 234 # returns = { :title => title, :icon => icon, :url => url }
229 235 # title = name that will be displayed.
... ...
plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb
  Diff comments   View file @1db348b
1 1 class WorkAssignmentPluginCmsController < CmsController
2 2  
3   - def edits
  3 + def edit_visibility
4 4 @folder = profile.articles.find(params[:article_id])
5 5 @back_to = url_for(@folder.parent.url)
6 6 if request.post?
7 7 @folder.published = params[:article][:published]
8 8 unless params[:q].nil?
9 9 @folder.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i}
  10 + @folder.children.each do |c|
  11 + c.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i}
  12 + c.save!
  13 + end
10 14 end
11 15 @folder.save!
12 16 redirect_to @back_to
13   - x = Article.find_by_id(@folder.id)
14   - puts "a"*55
15   - puts "#{x.published?}"
16 17 end
17 18 end
18 19 end
19 20 \ No newline at end of file
... ...
plugins/work_assignment/lib/work_assignment_plugin.rb
  Diff comments   View file @1db348b
... ... @@ -9,18 +9,8 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
9 9 end
10 10  
11 11 def self.can_download_submission?(user, submission)
12   - work_assignment = submission.parent.parent
13   - submission_folder = submission.parent
14   -
15   - if work_assignment.allow_privacy_edition
16   - submission_folder.published? || (user && (submission.author == user ||
17   - user.has_permission?('view_private_content', work_assignment.profile)))
18   - else
19   - # work_assignment.publish_submissions || (user && (submission.author == user ||
20   - # user.has_permission?('view_private_content', work_assignment.profile) ||
21   - # work_assignment.display_unpublished_article_to?(user)))
22   - false
23   - end
  12 + submission.published? || (user && (submission.author == user || user.has_permission?('view_private_content', submission.profile) ||
  13 + submission.display_unpublished_article_to?(user)))
24 14 end
25 15  
26 16 def self.is_submission?(content)
... ... @@ -47,7 +37,7 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
47 37  
48 38 def content_viewer_controller_filters
49 39 block = proc do
50   - path = params[:page]
  40 + path = get_path(params[:page], params[:format])
51 41 content = profile.articles.find_by_path(path)
52 42  
53 43 if WorkAssignmentPlugin.is_submission?(content) && !WorkAssignmentPlugin.can_download_submission?(user, content)
... ... @@ -92,4 +82,10 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
92 82 end
93 83 end
94 84  
  85 + def add_action_to_list
  86 + proc do
  87 + action_list.append(", edits, search_article_privacy_exceptions")
  88 + end
  89 + end
  90 +
95 91 end
... ...
plugins/work_assignment/lib/work_assignment_plugin/helper.rb
  Diff comments   View file @1db348b
... ... @@ -50,7 +50,6 @@ module WorkAssignmentPlugin::Helper
50 50 end
51 51 end
52 52  
53   -
54 53 def link_to_last_submission(author_folder, user)
55 54 if WorkAssignmentPlugin.can_download_submission?(user, author_folder.children.last)
56 55 link_to(author_folder.name, author_folder.children.last.url)
... ... @@ -58,6 +57,7 @@ module WorkAssignmentPlugin::Helper
58 57 author_folder.name
59 58 end
60 59 end
  60 +
61 61 # FIXME Copied from custom-froms. Consider passing it to core...
62 62 def time_format(time)
63 63 minutes = (time.min == 0) ? '' : ':%M'
... ... @@ -67,23 +67,24 @@ module WorkAssignmentPlugin::Helper
67 67 end
68 68  
69 69 def display_delete_button(article)
70   - expirable_button article, :delete, _('Delete'), {:controller =>'cms', :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
  70 + expirable_button article, :delete, _('Delete'),
  71 + {:controller =>'cms', :action => 'destroy', :id => article.id },
  72 + :method => :post, :confirm => delete_article_message(article)
71 73 end
72 74  
73   -
74 75 def display_privacy_button(author_folder, user)
75 76 if author_folder
76 77 @folder = environment.articles.find_by_id(author_folder.id)
77 78 work_assignment = @folder.parent
78 79  
79   - if(user && (author_folder.author_id == user.id || user.has_permission?('view_private_content', work_assignment.profile)))
  80 + if(user && work_assignment.allow_privacy_edition && (author_folder.author_id == user.id || user.has_permission?('view_private_content', work_assignment.profile)))
80 81 @tokenized_children = prepare_to_token_input(
81 82 profile.members.includes(:articles_with_access).find_all{ |m|
82 83 m.articles_with_access.include?(@folder)
83 84 }
84 85 )
85   - colorbox_button('edit', _('Edit'), :controller => 'work_assignment_plugin_cms',
86   - :action => 'edits', :layout => false, :article_id => @folder.id, :tokenized_children => @tokenized_children)
  86 + colorbox_button :edit, _('Edit'), { :controller => 'work_assignment_plugin_cms',
  87 + :action => 'edit_visibility', :article_id => @folder.id, :tokenized_children => @tokenized_children}
87 88 end
88 89 end
89 90 end
... ...
plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
  Diff comments   View file @1db348b
... ... @@ -45,6 +45,7 @@ class WorkAssignmentPlugin::WorkAssignment &lt; Folder
45 45 :parent => self,
46 46 :profile => profile,
47 47 :author => author,
  48 + :published => publish_submissions,
48 49 },
49 50 :without_protection => true
50 51 )
... ...
plugins/work_assignment/public/content_resize.js 0 → 100644
  Diff comments   View file @1db348b
... ... @@ -0,0 +1,3 @@
  1 +
  2 +
  3 + alert( 'oi');
... ...
plugins/work_assignment/views/cms/edit_visibility.html.erb 0 → 100644
  Diff comments   View file @1db348b
... ... @@ -0,0 +1,24 @@
  1 +<!-- <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'> -->
  2 +<div class="select-privacy-options">
  3 +<%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
  4 +
  5 + <% @article = environment.articles.find_by_id((params[:article_id]))%>
  6 +
  7 + <% @tokenized_children = params[:tokenized_children]%>
  8 +
  9 + <%= hidden_field_tag('article_id', @article.id) %>
  10 +
  11 + <div id='edit-article-options'>
  12 + <%= options_for_article(@article, @tokenized_children) %>
  13 + </div>
  14 +
  15 + <% button_bar do %>
  16 + <%= submit_button :save, _('Save') %>
  17 + <%= colorbox_close_button(_('Cancel')) %>
  18 + <% end %>
  19 +<% end %>
  20 +</div>
  21 +
  22 +<br style='clear: both'/>
  23 +
  24 +<%= javascript_include_tag "article.js" %>
0 25 \ No newline at end of file
... ...
plugins/work_assignment/views/cms/edits.html.erb
View file @03744ac
... ... @@ -1,24 +0,0 @@
1   -<!-- <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'> -->
2   -<div class="select-privacy-options">
3   -<%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
4   -
5   - <% @article = environment.articles.find_by_id((params[:article_id]))%>
6   -
7   - <% @tokenized_children = params[:tokenized_children]%>
8   -
9   - <%= hidden_field_tag('article_id', @article.id) %>
10   -
11   - <div id='edit-article-options'>
12   - <%= options_for_article(@article, @tokenized_children) %>
13   - </div>
14   -
15   - <% button_bar do %>
16   - <%= submit_button :save, _('Save') %>
17   - <%= colorbox_close_button(_('Cancel')) %>
18   - <% end %>
19   -<% end %>
20   -</div>
21   -
22   -<br style='clear: both'/>
23   -
24   -<%= javascript_include_tag "article.js" %>
25 0 \ No newline at end of file