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>

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>
Marcos Pereira · Tallys Martins
1 parent 03744acd
Showing 9 changed files with 59 additions and 48 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
lib/noosfero/plugin.rb
plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb
plugins/work_assignment/lib/work_assignment_plugin.rb
plugins/work_assignment/lib/work_assignment_plugin/helper.rb
plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
plugins/work_assignment/public/content_resize.js
plugins/work_assignment/views/cms/edit_visibility.html.erb
plugins/work_assignment/views/cms/edits.html.erb
@@ -30,7 +30,8 @@ class CmsController &lt; MyProfileController
     (user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile)))
   end
-  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new] do |c, user, profile|
+  action_list = [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files, :new]
+  protect_if :except => action_list do |c, user, profile|
     user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
   end
@@ -48,6 +49,8 @@ class CmsController &lt; MyProfileController
     profile.articles.find(c.params[:id]).allow_edit?(user)
   end
+
+
   def boxes_holder
     profile
   end
@@ -224,6 +224,12 @@ class Noosfero::Plugin
     false
   end
+  # -> Add action names to a list of filtered actions on cms controller
+  # returns = []
+  def add_action_to_list
+    []
+  end
+
   # -> Adds buttons to the control panel
   # returns = { :title => title, :icon => icon, :url => url }
   #   title = name that will be displayed.
 class WorkAssignmentPluginCmsController < CmsController
-  def edits
+  def edit_visibility
     @folder = profile.articles.find(params[:article_id])
     @back_to = url_for(@folder.parent.url)
     if request.post?
       @folder.published = params[:article][:published]
       unless params[:q].nil?
         @folder.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i}
+        @folder.children.each do |c|
+          c.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i}
+          c.save!
+        end
       end
       @folder.save!
       redirect_to @back_to
-      x = Article.find_by_id(@folder.id)
-      puts "a"*55
-      puts "#{x.published?}"
     end
   end
 end
 \ No newline at end of file
@@ -9,18 +9,8 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
   end
   def self.can_download_submission?(user, submission)
-      work_assignment = submission.parent.parent
-      submission_folder = submission.parent
-
-      if work_assignment.allow_privacy_edition
-        submission_folder.published? || (user && (submission.author == user ||
-        user.has_permission?('view_private_content', work_assignment.profile)))
-      else
-        # work_assignment.publish_submissions || (user && (submission.author == user ||
-        # user.has_permission?('view_private_content', work_assignment.profile) ||
-        # work_assignment.display_unpublished_article_to?(user)))
-        false
-      end
+      submission.published? || (user && (submission.author == user || user.has_permission?('view_private_content', submission.profile) ||
+      submission.display_unpublished_article_to?(user)))
   end
   def self.is_submission?(content)
@@ -47,7 +37,7 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
   def content_viewer_controller_filters
     block = proc do
-      path = params[:page]
+      path = get_path(params[:page], params[:format])
       content = profile.articles.find_by_path(path)
       if WorkAssignmentPlugin.is_submission?(content) && !WorkAssignmentPlugin.can_download_submission?(user, content)
@@ -92,4 +82,10 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
     end
   end
+  def add_action_to_list
+    proc do
+      action_list.append(", edits, search_article_privacy_exceptions")
+    end
+  end 
+
 end
@@ -50,7 +50,6 @@ module WorkAssignmentPlugin::Helper
     end
   end
-
   def link_to_last_submission(author_folder, user)
     if WorkAssignmentPlugin.can_download_submission?(user, author_folder.children.last)
       link_to(author_folder.name, author_folder.children.last.url)
@@ -58,6 +57,7 @@ module WorkAssignmentPlugin::Helper
       author_folder.name
     end
   end
+
   # FIXME Copied from custom-froms. Consider passing it to core...
   def time_format(time)
     minutes = (time.min == 0) ? '' : ':%M'
@@ -67,23 +67,24 @@ module WorkAssignmentPlugin::Helper
   end
   def display_delete_button(article)
-    expirable_button article, :delete, _('Delete'), {:controller =>'cms', :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
+    expirable_button article, :delete, _('Delete'), 
+    {:controller =>'cms', :action => 'destroy', :id => article.id }, 
+    :method => :post, :confirm => delete_article_message(article)
   end
-
   def display_privacy_button(author_folder, user)
     if author_folder
       @folder = environment.articles.find_by_id(author_folder.id)
       work_assignment = @folder.parent
-      if(user && (author_folder.author_id == user.id || user.has_permission?('view_private_content', work_assignment.profile))) 
+      if(user && work_assignment.allow_privacy_edition && (author_folder.author_id == user.id || user.has_permission?('view_private_content', work_assignment.profile))) 
         @tokenized_children = prepare_to_token_input(
                               profile.members.includes(:articles_with_access).find_all{ |m|
                                 m.articles_with_access.include?(@folder)
                               }
                             )
-        colorbox_button('edit', _('Edit'), :controller => 'work_assignment_plugin_cms', 
-        :action => 'edits', :layout => false, :article_id => @folder.id, :tokenized_children => @tokenized_children)
+        colorbox_button :edit, _('Edit'), { :controller => 'work_assignment_plugin_cms', 
+        :action => 'edit_visibility', :article_id => @folder.id, :tokenized_children => @tokenized_children}
       end
     end
   end
@@ -45,6 +45,7 @@ class WorkAssignmentPlugin::WorkAssignment &lt; Folder
                                                                   :parent => self,
                                                                   :profile => profile,
                                                                   :author => author,
+                                                                  :published => publish_submissions,
                                                                 }, 
                                                                 :without_protection => true
                                                   )
@@ -0,0 +1,3 @@
+
+
+  alert( 'oi');
@@ -0,0 +1,24 @@
+<!-- <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'> -->
+<div class="select-privacy-options">
+<%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
+
+  <% @article = environment.articles.find_by_id((params[:article_id]))%>
+
+  <% @tokenized_children = params[:tokenized_children]%>
+
+  <%= hidden_field_tag('article_id', @article.id) %>
+
+  <div id='edit-article-options'>
+    <%= options_for_article(@article, @tokenized_children) %>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button :save, _('Save') %>
+    <%= colorbox_close_button(_('Cancel')) %>
+  <% end %>
+<% end %>
+</div>
+
+<br style='clear: both'/>
+
+<%= javascript_include_tag "article.js" %>
 \ No newline at end of file
@@ -1,24 +0,0 @@
-<!-- <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'> -->
-<div class="select-privacy-options">
-<%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
-
-  <% @article = environment.articles.find_by_id((params[:article_id]))%>
-
-  <% @tokenized_children = params[:tokenized_children]%>
-
-  <%= hidden_field_tag('article_id', @article.id) %>
-
-  <div id='edit-article-options'>
-    <%= options_for_article(@article, @tokenized_children) %>
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button :save, _('Save') %>
-    <%= colorbox_close_button(_('Cancel')) %>
-  <% end %>
-<% end %>
-</div>
-
-<br style='clear: both'/>
-
-<%= javascript_include_tag "article.js" %>
 \ No newline at end of file
	@@ -224,6 +224,12 @@ class Noosfero::Plugin		@@ -224,6 +224,12 @@ class Noosfero::Plugin
224	false	224	false
225	end	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	# -> Adds buttons to the control panel	233	# -> Adds buttons to the control panel
228	# returns = { :title => title, :icon => icon, :url => url }	234	# returns = { :title => title, :icon => icon, :url => url }
229	# title = name that will be displayed.	235	# title = name that will be displayed.
	@@ -0,0 +1,24 @@		@@ -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	\ No newline at end of file	25	\ No newline at end of file
	@@ -1,24 +0,0 @@		@@ -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	\ No newline at end of file	0	\ No newline at end of file