Merge branch 'work_assignment_master_rebase' into 'master'

Work assignment master rebase The last version of the Work Assignment plugin, increased by Universidade de Brasília team. The plugin purpose is to keep versioned files, result of a work and to notify people by email about new uploaded files. Users can also change the visibility of their files, if the feature is set on Work Assignment settings. See merge request !420

Merge branch 'work_assignment_master_rebase' into 'master'
Work assignment master rebase The last version of the Work Assignment plugin, increased by Universidade de Brasília team. The plugin purpose is to keep versioned files, result of a work and to notify people by email about new uploaded files. Users can also change the visibility of their files, if the feature is set on Work Assignment settings. See merge request !420
Antonio Terceiro
2 parents d9a2d31d c13119fb
Showing 19 changed files with 543 additions and 55 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/views/cms/upload_files.html.erb
lib/noosfero/plugin.rb
plugins/work_assignment/controllers/work_assignment_plugin_myprofile_controller.rb
plugins/work_assignment/lib/ext/article.rb
plugins/work_assignment/lib/ext/folder.rb
plugins/work_assignment/lib/ext/uploaded_file.rb
plugins/work_assignment/lib/work_assignment_plugin.rb
plugins/work_assignment/lib/work_assignment_plugin/email_contact.rb
plugins/work_assignment/lib/work_assignment_plugin/helper.rb
plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
plugins/work_assignment/test/functional/cms_controller_test.rb
plugins/work_assignment/test/functional/content_viewer_controller_test.rb
plugins/work_assignment/test/functional/work_assignment_plugin_myprofile_controller_test.rb
plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
plugins/work_assignment/views/cms/_notify_text_field.html.erb
plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb
plugins/work_assignment/views/work_assignment_plugin_myprofile/edit_visibility.html.erb
@@ -214,6 +214,7 @@ class CmsController &lt; MyProfileController
       if @errors.any?
         render :action => 'upload_files', :parent_id => @parent_id
       else
+        session[:notice] = _('File(s) successfully uploaded') 
         if @back_to
           redirect_to @back_to
         elsif @parent
@@ -20,5 +20,10 @@
 <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
  
 <%= form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
+
+  <%= @plugins.dispatch(:upload_files_extra_fields, params[:parent_id]).collect { |content| instance_exec(&content) }.join("") %>
+
   <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
-<% end %>
+
+<% end %> 
+
@@ -417,6 +417,12 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Adds adicional fields to a view
+  # returns = proc block that creates html code
+  def upload_files_extra_fields(article)
+    nil
+  end
+  
   # -> Adds fields to the signup form
   # returns = proc that creates html code
   def signup_extra_contents
@@ -0,0 +1,38 @@
+class WorkAssignmentPluginMyprofileController < MyProfileController
+
+helper ArticleHelper
+helper CmsHelper
+
+before_filter :protect_if, :only => [:edit_visibility]
+
+def edit_visibility
+  unless params[:article_id].blank?
+    folder = profile.environment.articles.find_by_id(params[:article_id])
+    @back_to = url_for(folder.parent.url)
+    unless params[:article].blank?
+      folder.published = params[:article][:published]
+      unless params[:q].nil?
+        folder.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i}
+      end
+      folder.save!
+      redirect_to @back_to
+    end    
+  end
+ end
+
+  def search_article_privacy_exceptions
+    arg = params[:q].downcase
+    result = profile.members.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    render :text => prepare_to_token_input(result).to_json
+  end
+
+  protected
+
+  def protect_if
+    article = environment.articles.find_by_id(params[:article_id])
+    render_access_denied unless (user && !article.nil? && (user.is_member_of? article.profile) &&
+    article.parent.allow_visibility_edition && article.folder? &&
+    (article.author == user || user.has_permission?('view_private_content', profile)))
+  end
+
+end
@@ -0,0 +1,20 @@
+require_dependency 'article'
+
+class Article
+  before_validation :work_assignment_save_into_author_folder
+  after_validation :work_assignment_change_visibility
+
+  def work_assignment_save_into_author_folder
+    if not self.is_a? Folder and self.parent.kind_of? WorkAssignmentPlugin::WorkAssignment
+      author_folder = self.parent.find_or_create_author_folder(self.author)
+      self.name = WorkAssignmentPlugin::WorkAssignment.versioned_name(self, author_folder)
+      self.parent = author_folder
+    end
+  end
+
+  def work_assignment_change_visibility
+    if self.parent && self.parent.parent && self.parent.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
+      self.published = self.parent.published
+    end
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,13 @@
+require_dependency 'article'
+require_dependency 'folder'
+
+class Folder < Article
+  after_save do |folder|
+    if folder.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
+      folder.children.each do |c|
+        c.published = folder.published
+        c.article_privacy_exceptions = folder.article_privacy_exceptions
+      end
+    end
+  end
+end
@@ -1,12 +0,0 @@
-require_dependency 'article'
-require_dependency 'uploaded_file'
-
-class UploadedFile < Article
-  before_validation do |uploaded_file|
-    if uploaded_file.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
-      author_folder = uploaded_file.parent.find_or_create_author_folder(uploaded_file.author)
-      uploaded_file.name = WorkAssignmentPlugin::WorkAssignment.versioned_name(uploaded_file, author_folder)
-      uploaded_file.parent = author_folder
-    end
-  end
-end
@@ -9,8 +9,8 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
   end
  
   def self.can_download_submission?(user, submission)
-    work_assignment = submission.parent.parent
-    work_assignment.publish_submissions || (user && (submission.author == user || user.has_permission?('view_private_content', work_assignment.profile)))
+      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)
@@ -37,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)
@@ -51,4 +51,34 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
       :block => block }
   end
  
+  def cms_controller_filters
+    block = proc do
+      if request.post? && params[:uploaded_files]
+        email_notification = params[:article_email_notification]
+        unless !email_notification || email_notification.empty?
+          email_contact = WorkAssignmentPlugin::EmailContact.new(:subject => @parent.name, :receiver => email_notification, :sender => user)
+          WorkAssignmentPlugin::EmailContact::EmailSender.build_mail_message(email_contact, @uploaded_files)
+          if email_contact.deliver
+            session[:notice] = _('Notification successfully sent')
+          else
+            session[:notice] = _('Notification not sent')
+          end
+        end
+      end
+    end
+
+    { :type => 'after_filter',
+      :method_name => 'send_email_after_upload_file',
+      :options => {:only => 'upload_files'},
+      :block => block }
+  end
+
+  def upload_files_extra_fields(article)
+    proc do
+      @article = Article.find_by_id(article)
+      if params[:parent_id] && !@article.nil? && @article.type == "WorkAssignmentPlugin::WorkAssignment"
+        render :partial => 'notify_text_field',  :locals => { :size => '45'}
+      end
+    end
+  end
 end
@@ -0,0 +1,64 @@
+class WorkAssignmentPlugin::EmailContact
+
+  include ActiveModel::Validations
+
+  def initialize(attributes = nil)
+    if attributes
+      attributes.each do |attr,value|
+        self.send("#{attr}=", value)
+      end
+    end
+  end
+
+  attr_accessor :name
+  attr_accessor :subject
+  attr_accessor :message
+  attr_accessor :email
+  attr_accessor :receive_a_copy
+  attr_accessor :sender
+  attr_accessor :receiver
+
+  N_('Subject'); N_('Message'); N_('e-Mail'); N_('Name')
+
+  validates_presence_of :receiver, :subject, :message, :sender
+  validates_format_of :receiver, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|o| !o.email.blank?})
+
+  def deliver
+    return false unless self.valid?
+    WorkAssignmentPlugin::EmailContact::EmailSender.notification(self).deliver
+  end
+
+  class EmailSender < ActionMailer::Base
+
+    def notification(email_contact)
+      name = email_contact.sender.name
+      email = email_contact.sender.email
+      message = email_contact.message
+      target = email_contact.receiver
+
+      options = {
+        content_type: 'text/html',
+        to: target,
+        reply_to: email,
+        subject: email_contact.subject,
+        body: message,
+        from: "#{email_contact.sender.environment.name} <#{email_contact.sender.environment.contact_email}>",
+      }
+
+      mail(options)
+    end
+
+    def build_mail_message(email_contact, uploaded_files)
+      message = ""
+      if uploaded_files && uploaded_files.first && uploaded_files.first.parent && uploaded_files.first.parent.parent
+        article = uploaded_files.first.parent.parent
+        message = article.default_email + "<br>"
+        uploaded_files.each do |file|
+          url = url_for(file.url)
+          message += "<br><a href='#{url}'>#{url}</a>"
+        end
+      end
+      email_contact.message = message
+    end
+  end
+end
 module WorkAssignmentPlugin::Helper
+  include CmsHelper
+  
   def display_submissions(work_assignment, user)
     return if work_assignment.submissions.empty?
     content_tag('table',
@@ -6,6 +8,7 @@ module WorkAssignmentPlugin::Helper
         content_tag('th', c_('Author'), :style => 'width: 50%') +
         content_tag('th', _('Submission date')) +
         content_tag('th', _('Versions'), :style => 'text-align: center') +
+        content_tag('th', '') +
         content_tag('th', '')
       ).html_safe +
       work_assignment.children.map {|author_folder| display_author_folder(author_folder, user)}.join("\n").html_safe
@@ -18,7 +21,8 @@ module WorkAssignmentPlugin::Helper
       content_tag('td', link_to_last_submission(author_folder, user)) +
       content_tag('td', time_format(author_folder.children.last.created_at)) +
       content_tag('td', author_folder.children.count, :style => 'text-align: center') +
-      content_tag('td', content_tag('button', _('View all versions'), :class => 'view-author-versions', 'data-folder-id' => author_folder.id))
+      content_tag('td', content_tag('button', _('View all versions'), :class => 'view-author-versions', 'data-folder-id' => author_folder.id)) +
+      content_tag('td', display_privacy_button(author_folder, user))
     ).html_safe +
     author_folder.children.map {|submission| display_submission(submission, user)}.join("\n").html_safe
   end
@@ -26,7 +30,13 @@ module WorkAssignmentPlugin::Helper
   def display_submission(submission, user)
     content_tag('tr',
       content_tag('td', link_to_submission(submission, user)) +
-      content_tag('td', time_format(submission.created_at), :colspan => 3),
+      content_tag('td', time_format(submission.created_at))+
+      content_tag('td', '') +
+      content_tag('td', 
+        if submission.parent.parent.allow_post_content?(user)
+          display_delete_button(submission)
+        end
+      ),
       :class => "submission-from-#{submission.parent.id}",
       :style => 'display: none'
     )
@@ -40,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)
@@ -48,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'
@@ -56,4 +66,28 @@ module WorkAssignmentPlugin::Helper
     time.strftime("%Y-%m-%d#{hour+minutes+h}")
   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)
+  end
+
+  def display_privacy_button(author_folder, user)
+    folder = environment.articles.find_by_id(author_folder.id)
+    work_assignment = folder.parent
+    @back_to = url_for(work_assignment.url)
+
+    if(user && work_assignment.allow_visibility_edition &&
+      ((author_folder.author_id == user.id && (user.is_member_of? profile)) ||
+      user.has_permission?('view_private_content', profile)))
+
+      @tokenized_children = prepare_to_token_input(
+                            profile.members.includes(:articles_with_access).find_all{ |m|
+                              m.articles_with_access.include?(folder)
+                            })
+      button :edit, _('Edit'), { :controller => 'work_assignment_plugin_myprofile',
+      :action => 'edit_visibility', :article_id => folder.id,
+      :tokenized_children => @tokenized_children, :back_to => @back_to}, :method => :post
+    end
+  end
 end
 class WorkAssignmentPlugin::WorkAssignment < Folder
  
   settings_items :publish_submissions, :type => :boolean, :default => false
+  settings_items :default_email, :type => :string, :default => ""
+  settings_items :allow_visibility_edition, :type => :boolean, :default => false
  
   attr_accessible :publish_submissions
-
+  attr_accessible :default_email
+  attr_accessible :allow_visibility_edition
+  
   def self.icon_name(article = nil)
     'work-assignment'
   end
@@ -29,13 +33,22 @@ class WorkAssignmentPlugin::WorkAssignment &lt; Folder
   end
  
   def to_html(options = {})
-    proc do
+    lambda do
       render :file => 'content_viewer/work_assignment.html.erb'
     end
   end
  
   def find_or_create_author_folder(author)
-    children.find_by_slug(author.name.to_slug) || Folder.create!(:name => author.name, :parent => self, :profile => profile)
+    children.find_by_slug(author.name.to_slug) || Folder.create!(
+                                                                {
+                                                                  :name => author.name,
+                                                                  :parent => self,
+                                                                  :profile => profile,
+                                                                  :author => author,
+                                                                  :published => publish_submissions,
+                                                                }, 
+                                                                :without_protection => true
+                                                  )
   end
  
   def submissions
@@ -45,6 +58,5 @@ class WorkAssignmentPlugin::WorkAssignment &lt; Folder
   def cache_key_with_person(params = {}, user = nil, language = 'en')
     cache_key_without_person + (user && profile.members.include?(user) ? "-#{user.identifier}" : '')
   end
-  alias_method_chain :cache_key, :person
-
+  alias_method_chain :cache_key, :person  
 end
-require 'test_helper'
+require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
 require 'cms_controller'
  
 # Re-raise errors caught by the controller.
@@ -12,33 +12,67 @@ class CmsControllerTest &lt; ActionController::TestCase
     @response   = ActionController::TestResponse.new
     @person = create_user('test_user').person
     login_as :test_user
+    e = Environment.default
+    e.enabled_plugins = ['WorkAssignmentPlugin']
+    e.save!
+    @organization = fast_create(Organization) #
   end
  
-  attr_accessor :person
-
   should 'not allow non-members to upload submissions on work_assignment' do
-    organization = fast_create(Organization)
-    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
-
-    get :upload_files, :profile => organization.identifier, :parent_id => work_assignment.id
+    work_assignment = create_work_assignment('Work Assignment', @organization, nil, nil)
+    get :upload_files, :profile => @organization.identifier, :parent_id => work_assignment.id
     assert_response :forbidden
     assert_template 'access_denied'
+  end
  
-    organization.add_member(person)
-
-    get :upload_files, :profile => organization.identifier, :parent_id => work_assignment.id
+  should 'allow members to upload submissions on work_assignment' do
+    @organization.add_member(@person)
+    # then he trys to upload new stuff
+    work_assignment = create_work_assignment('Work Assignment', @organization, nil, nil)
+    get :upload_files, :profile => @organization.identifier, :parent_id => work_assignment.id
     assert_response :success
   end
  
+  should 'redirect to Work Assignment view page after upload submission' do
+    @organization.add_member(@person)
+    work_assignment = create_work_assignment('Work Assignment', @organization, nil, nil)
+    post :upload_files, :profile => @organization.identifier, :parent_id => work_assignment.id, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain')] , :back_to => @work_assignment.url
+    assert_redirected_to work_assignment.url
+  end
+
   should 'upload submission and automatically move it to the author folder' do
-    organization = fast_create(Organization)
-    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
-    organization.add_member(person)
-    post :upload_files, :profile => organization.identifier, :parent_id => work_assignment.id, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain')]
+    work_assignment = create_work_assignment('Work Assignment', @organization, nil, nil)
+    @organization.add_member(@person)
+    post :upload_files, :profile => @organization.identifier, :parent_id => work_assignment.id, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain')]
+    submission = UploadedFile.last
+    assert_equal work_assignment.find_or_create_author_folder(@person), submission.parent
+  end
+
+  should 'work_assignment attribute allow_visibility_edition is true when set a new work_assignment' do
+    work_assignment = create_work_assignment('Work Assignment', @organization, nil, true)
+    @organization.add_member(@person)
+    assert_equal true, work_assignment.allow_visibility_edition
+  end
  
+  should 'a submission and parent attribute "published" be equal to Work Assignment attribute publish submissions' do
+    @organization.add_member(@person)
+    work_assignment = create_work_assignment('Work Assignment', @organization, true, nil)
+    assert_equal true, work_assignment.publish_submissions
+    post :upload_files, :profile => @organization.identifier, :parent_id => work_assignment.id, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain')]
     submission = UploadedFile.last
-    assert_equal work_assignment.find_or_create_author_folder(person), submission.parent
+    assert_equal work_assignment.publish_submissions, submission.published
+    assert_equal work_assignment.publish_submissions, submission.parent.published
+
+    other_work_assignment = create_work_assignment('Other Work Assigment', @organization, false, nil)
+    assert_equal false, other_work_assignment.publish_submissions
+    post :upload_files, :profile => @organization.identifier, :parent_id => other_work_assignment.id, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain')]
+    submission = UploadedFile.last
+    assert_equal other_work_assignment.publish_submissions, submission.published
+    assert_equal other_work_assignment.publish_submissions, submission.parent.published
   end
  
+  private
+    def create_work_assignment(name = nil, profile = nil, publish_submissions = nil, allow_visibility_edition = nil)
+      @work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => name, :profile => profile, :publish_submissions => publish_submissions, :allow_visibility_edition => allow_visibility_edition)
+    end
 end
-
-require 'test_helper'
+require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
 require 'content_viewer_controller'
  
 # Re-raise errors caught by the controller.
@@ -15,6 +15,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     @organization = fast_create(Organization)
     @work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => @organization)
     @person = create_user('test_user').person
+    @organization.add_member(@person)
     @environment = @organization.environment
     @environment.enable_plugin(WorkAssignmentPlugin)
     @environment.save!
@@ -23,19 +24,17 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   attr_reader :organization, :person, :profile, :work_assignment
  
   should 'can download work_assignment' do
-    random_member = fast_create(Person)
-    organization.add_member(random_member)
-    folder = work_assignment.find_or_create_author_folder(random_member)
+    folder = work_assignment.find_or_create_author_folder(@person)
     submission = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => organization, :parent => folder)
     WorkAssignmentPlugin.stubs(:can_download_submission?).returns(false)
  
-    get :view_page, :profile => organization.identifier, :page => submission.path
+    get :view_page, :profile => @organization.identifier, :page => submission.path
     assert_response :forbidden
     assert_template 'access_denied'
  
     WorkAssignmentPlugin.stubs(:can_download_submission?).returns(true)
  
-    get :view_page, :profile => organization.identifier, :page => submission.path
+    get :view_page, :profile => @organization.identifier, :page => submission.path
     assert_response :success
   end
  
@@ -0,0 +1,191 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
+require 'work_assignment_plugin_myprofile_controller'
+
+# Re-raise errors caught by the controller.
+class WorkAssignmentPluginMyprofileController; def rescue_action(e) raise e end; end
+
+class WorkAssignmentPluginMyprofileControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = WorkAssignmentPluginMyprofileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = create_user('test_user').person
+    login_as :test_user
+    e = Environment.default
+    e.enabled_plugins = ['WorkAssignmentPlugin']
+    e.save!
+    @organization = fast_create(Organization) #
+  end
+
+  should 'submission edit visibility deny access to users and admin when Work Assignment allow_visibility_edition is false' do
+    @organization.add_member(@person)
+    ##### Testing with normal user
+    work_assignment = create_work_assignment('Work Assignment', @organization, nil, false)
+    work_assignment.save!
+    assert_equal false, work_assignment.allow_visibility_edition
+    parent = work_assignment.find_or_create_author_folder(@person)
+    UploadedFile.create(
+            {
+              :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'),
+              :profile => @organization,
+              :parent => parent,
+              :last_changed_by => @person,
+              :author => @person,
+            },
+            :without_protection => true
+          )
+    submission = UploadedFile.find_by_filename("test.txt")
+    assert_equal false, submission.published
+    assert_equal false, submission.parent.published
+
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
+    assert_template 'access_denied'
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
+    assert_template 'access_denied'
+
+    submission.reload
+    assert_equal false, submission.published
+    assert_equal false, submission.parent.published
+
+    #### Even with admin user
+    e = Environment.default
+    assert_equal false, @person.is_admin?
+    e.add_admin(@person)
+    e.save!
+    assert_equal true, @person.is_admin?
+
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
+    assert_template 'access_denied'
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
+    assert_template 'access_denied'
+
+    submission.reload
+    assert_equal false, submission.published
+  end
+
+  should 'redirect an unlogged user to the login page if he tryes to access the edit visibility page and work_assignment allow_visibility_edition is true' do
+    @organization.add_member(@person)
+    work_assignment = create_work_assignment('Work Assignment', @organization, nil, true)
+    assert_equal true, work_assignment.allow_visibility_edition
+    work_assignment.save!
+    parent = work_assignment.find_or_create_author_folder(@person)
+    UploadedFile.create(
+            {
+              :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'),
+              :profile => @organization,
+              :parent => parent,
+              :last_changed_by => @person,
+              :author => @person,
+            },
+            :without_protection => true
+          )
+    logout
+    submission = UploadedFile.find_by_filename("test.txt")
+    assert_equal false, submission.parent.published
+    assert_equal false, submission.published
+
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
+    assert_redirected_to '/account/login'
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
+    assert_redirected_to '/account/login'
+    submission.reload
+    assert_equal false, submission.parent.published
+    assert_equal false, submission.published
+  end
+
+  should 'submission edit_visibility deny access to not owner when WorkAssignment edit_visibility is true' do
+    @organization.add_member(@person) # current_user is a member
+    work_assignment = create_work_assignment('Another Work Assignment', @organization, nil, true)
+    parent = work_assignment.find_or_create_author_folder(@person)
+    UploadedFile.create(
+            {
+              :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'),
+              :profile => @organization,
+              :parent => parent,
+              :last_changed_by => @person,
+              :author => @person,
+            },
+            :without_protection => true
+          )
+    logout
+
+
+    other_person = create_user('other_user').person
+    @organization.add_member(other_person)
+    login_as :other_user
+
+    @organization.add_member(other_person)
+    submission = UploadedFile.find_by_filename("test.txt")
+    assert_equal(submission.author, @person)
+
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
+    assert_template 'access_denied'
+
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
+    assert_template 'access_denied'
+
+    submission.reload
+    assert_equal false, submission.parent.published
+    assert_equal false, submission.published
+  end
+
+  should 'submission white list give permission to an user that has been added' do
+    other_person = create_user('other_user').person
+    @organization.add_member(@person)
+    @organization.add_member(other_person)
+    work_assignment = create_work_assignment('Another Work Assignment', @organization, false,  true)
+    parent = work_assignment.find_or_create_author_folder(@person)
+    UploadedFile.create(
+            {
+              :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'),
+              :profile => @organization,
+              :parent => parent,
+              :last_changed_by => @person,
+              :author => @person,
+            },
+            :without_protection => true
+          )
+    submission = UploadedFile.find_by_filename("test.txt")
+    assert_equal false, submission.article_privacy_exceptions.include?(other_person)
+    post :edit_visibility, :profile => @organization.identifier, :article_id  => parent.id, :article => { :published => false }, :q => other_person.id
+    submission.reload
+    assert_equal true, submission.parent.article_privacy_exceptions.include?(other_person)
+    assert_equal true, submission.article_privacy_exceptions.include?(other_person)
+  end
+
+  should 'submission edit_visibility deny access to owner if not organization member' do
+    @organization.add_member(@person) # current_user is a member
+    work_assignment = create_work_assignment('Work Assignment', @organization, nil, true)
+    parent = work_assignment.find_or_create_author_folder(@person)
+    UploadedFile.create(
+            {
+              :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'),
+              :profile => @organization,
+              :parent => parent,
+              :last_changed_by => @person,
+              :author => @person,
+            },
+            :without_protection => true
+          )
+    @organization.remove_member(@person)
+    submission = UploadedFile.find_by_filename("test.txt")
+
+    assert_equal false, (@person.is_member_of? submission.profile)
+
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id
+    assert_template 'access_denied'
+
+    post :edit_visibility, :profile => @organization.identifier, :article_id => parent.id, :article => { :published => true }
+    assert_template 'access_denied'
+
+    submission.reload
+    assert_equal false, submission.parent.published
+    assert_equal false, submission.published
+  end
+
+  private
+    def create_work_assignment(name = nil, profile = nil, publish_submissions = nil, allow_visibility_edition = nil)
+      @work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => name, :profile => profile, :publish_submissions => publish_submissions, :allow_visibility_edition => allow_visibility_edition)
+    end
+end
-require "test_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../../../../../test/test_helper")
  
 class WorkAssignmentTest < ActiveSupport::TestCase
   should 'find or create sub-folder based on author identifier' do
-require 'test_helper'
+require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
  
 class WorkAssignmentPluginTest < ActiveSupport::TestCase
   should 'verify if a content is a work_assignment submission' do
     organization = fast_create(Organization)
-    content = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => organization, :author => fast_create(Person))
+    folder = fast_create(Folder)
+    person = fast_create(Person)
+    content = UploadedFile.create(
+            {
+              :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'),
+              :profile => organization,
+              :parent => folder,
+              :last_changed_by => person,
+              :author => person,
+            },
+            :without_protection => true
+          )
     assert !WorkAssignmentPlugin.is_submission?(content)
  
     work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
@@ -22,7 +33,9 @@ class WorkAssignmentPluginTest &lt; ActiveSupport::TestCase
     work_assignment = submission.parent.parent
     work_assignment.publish_submissions = true
     work_assignment.save!
-    assert WorkAssignmentPlugin.can_download_submission?(nil, submission)
+
+    other_submission = create_submission(nil, work_assignment)
+    assert WorkAssignmentPlugin.can_download_submission?(nil, other_submission)
   end
  
   should 'be able to download submission if the user is author of it' do
@@ -45,12 +58,21 @@ class WorkAssignmentPluginTest &lt; ActiveSupport::TestCase
  
   private
  
-  def create_submission(author=nil)
+  def create_submission(author=nil, work_assignment=nil)
     author ||= fast_create(Person)
     organization = fast_create(Organization)
-
-    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
+    organization.add_member(author)
+    work_assignment ||= WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
     author_folder = work_assignment.find_or_create_author_folder(author)
-    create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => organization, :parent => author_folder, :author => author, :last_changed_by => author)
+    content = UploadedFile.create(
+            {
+              :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'),
+              :profile => organization,
+              :parent => author_folder,
+              :last_changed_by => author,
+              :author => author,
+            },
+            :without_protection => true
+          )
   end
 end
@@ -0,0 +1,3 @@
+<h5><%= _('If you want to notify someone about this action, fill the field below with the emails of the destinies, separated by comma.') %></h5>
+
+<%= labelled_text_field(_('Send notification to: '), 'article_email_notification', user.email, :style => 'width: 60%;') %>
 <%= render :partial => 'folder', :locals => {:f => f} %>
  
-<%= labelled_check_box(_('Publish submissions'), 'article[publish_submissions]', true, @article.publish_submissions) %>
+<%= labelled_form_field(_('Default email message:'), text_area(:article, :default_email, :rows => 3, :cols => 64)) %>
+
+<%=labelled_check_box(_('Publish submissions'), 'article[publish_submissions]', true, @article.publish_submissions) %>
+
+<%=labelled_check_box(_('Allow users change submissions privacy?'), 'article[allow_visibility_edition]', true, @article.allow_visibility_edition) %>
@@ -0,0 +1,24 @@
+<div class="select-visibility-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'>
+    <%= visibility_options(@article, @tokenized_children) %>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button :save, _('Save') %>
+    <%= button :cancel, _('Cancel'), @back_to %>
+  <% end %>
+<% end %>
+</div>
+
+<br style='clear: both'/>
+
+<%= javascript_include_tag "article.js" %>
...	...	@@ -214,6 +214,7 @@ class CmsController < MyProfileController
214	214	if @errors.any?
215	215	render :action => 'upload_files', :parent_id => @parent_id
216	216	else
	217	+ session[:notice] = _('File(s) successfully uploaded')
217	218	if @back_to
218	219	redirect_to @back_to
219	220	elsif @parent
...	...
...	...	@@ -20,5 +20,10 @@
20	20	<h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
21	21
22	22	<%= form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do \|f\| %>
	23	+
	24	+ <%= @plugins.dispatch(:upload_files_extra_fields, params[:parent_id]).collect { \|content\| instance_exec(&content) }.join("") %>
	25	+
23	26	<%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
24		-<% end %>
	27	+
	28	+<% end %>
	29	+
...	...
...	...	@@ -417,6 +417,12 @@ class Noosfero::Plugin
417	417	nil
418	418	end
419	419
	420	+ # -> Adds adicional fields to a view
	421	+ # returns = proc block that creates html code
	422	+ def upload_files_extra_fields(article)
	423	+ nil
	424	+ end
	425	+
420	426	# -> Adds fields to the signup form
421	427	# returns = proc that creates html code
422	428	def signup_extra_contents
...	...
...	...	@@ -0,0 +1,38 @@
	1	+class WorkAssignmentPluginMyprofileController < MyProfileController
	2	+
	3	+helper ArticleHelper
	4	+helper CmsHelper
	5	+
	6	+before_filter :protect_if, :only => [:edit_visibility]
	7	+
	8	+def edit_visibility
	9	+ unless params[:article_id].blank?
	10	+ folder = profile.environment.articles.find_by_id(params[:article_id])
	11	+ @back_to = url_for(folder.parent.url)
	12	+ unless params[:article].blank?
	13	+ folder.published = params[:article][:published]
	14	+ unless params[:q].nil?
	15	+ folder.article_privacy_exceptions = params[:q].split(/,/).map{\|n\| environment.people.find n.to_i}
	16	+ end
	17	+ folder.save!
	18	+ redirect_to @back_to
	19	+ end
	20	+ end
	21	+ end
	22	+
	23	+ def search_article_privacy_exceptions
	24	+ arg = params[:q].downcase
	25	+ result = profile.members.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
	26	+ render :text => prepare_to_token_input(result).to_json
	27	+ end
	28	+
	29	+ protected
	30	+
	31	+ def protect_if
	32	+ article = environment.articles.find_by_id(params[:article_id])
	33	+ render_access_denied unless (user && !article.nil? && (user.is_member_of? article.profile) &&
	34	+ article.parent.allow_visibility_edition && article.folder? &&
	35	+ (article.author == user \|\| user.has_permission?('view_private_content', profile)))
	36	+ end
	37	+
	38	+end
...	...
...	...	@@ -0,0 +1,20 @@
	1	+require_dependency 'article'
	2	+
	3	+class Article
	4	+ before_validation :work_assignment_save_into_author_folder
	5	+ after_validation :work_assignment_change_visibility
	6	+
	7	+ def work_assignment_save_into_author_folder
	8	+ if not self.is_a? Folder and self.parent.kind_of? WorkAssignmentPlugin::WorkAssignment
	9	+ author_folder = self.parent.find_or_create_author_folder(self.author)
	10	+ self.name = WorkAssignmentPlugin::WorkAssignment.versioned_name(self, author_folder)
	11	+ self.parent = author_folder
	12	+ end
	13	+ end
	14	+
	15	+ def work_assignment_change_visibility
	16	+ if self.parent && self.parent.parent && self.parent.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
	17	+ self.published = self.parent.published
	18	+ end
	19	+ end
	20	+end
0	21	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,13 @@
	1	+require_dependency 'article'
	2	+require_dependency 'folder'
	3	+
	4	+class Folder < Article
	5	+ after_save do \|folder\|
	6	+ if folder.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
	7	+ folder.children.each do \|c\|
	8	+ c.published = folder.published
	9	+ c.article_privacy_exceptions = folder.article_privacy_exceptions
	10	+ end
	11	+ end
	12	+ end
	13	+end
...	...
...	...	@@ -1,12 +0,0 @@
1		-require_dependency 'article'
2		-require_dependency 'uploaded_file'
3		-
4		-class UploadedFile < Article
5		- before_validation do \|uploaded_file\|
6		- if uploaded_file.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
7		- author_folder = uploaded_file.parent.find_or_create_author_folder(uploaded_file.author)
8		- uploaded_file.name = WorkAssignmentPlugin::WorkAssignment.versioned_name(uploaded_file, author_folder)
9		- uploaded_file.parent = author_folder
10		- end
11		- end
12		-end
...	...	@@ -9,8 +9,8 @@ class WorkAssignmentPlugin < Noosfero::Plugin
9	9	end
10	10
11	11	def self.can_download_submission?(user, submission)
12		- work_assignment = submission.parent.parent
13		- work_assignment.publish_submissions \|\| (user && (submission.author == user \|\| user.has_permission?('view_private_content', work_assignment.profile)))
	12	+ submission.published? \|\| (user && (submission.author == user \|\| user.has_permission?('view_private_content', submission.profile) \|\|
	13	+ submission.display_unpublished_article_to?(user)))
14	14	end
15	15
16	16	def self.is_submission?(content)
...	...	@@ -37,7 +37,7 @@ class WorkAssignmentPlugin < Noosfero::Plugin
37	37
38	38	def content_viewer_controller_filters
39	39	block = proc do
40		- path = params[:page]
	40	+ path = get_path(params[:page], params[:format])
41	41	content = profile.articles.find_by_path(path)
42	42
43	43	if WorkAssignmentPlugin.is_submission?(content) && !WorkAssignmentPlugin.can_download_submission?(user, content)
...	...	@@ -51,4 +51,34 @@ class WorkAssignmentPlugin < Noosfero::Plugin
51	51	:block => block }
52	52	end
53	53
	54	+ def cms_controller_filters
	55	+ block = proc do
	56	+ if request.post? && params[:uploaded_files]
	57	+ email_notification = params[:article_email_notification]
	58	+ unless !email_notification \|\| email_notification.empty?
	59	+ email_contact = WorkAssignmentPlugin::EmailContact.new(:subject => @parent.name, :receiver => email_notification, :sender => user)
	60	+ WorkAssignmentPlugin::EmailContact::EmailSender.build_mail_message(email_contact, @uploaded_files)
	61	+ if email_contact.deliver
	62	+ session[:notice] = _('Notification successfully sent')
	63	+ else
	64	+ session[:notice] = _('Notification not sent')
	65	+ end
	66	+ end
	67	+ end
	68	+ end
	69	+
	70	+ { :type => 'after_filter',
	71	+ :method_name => 'send_email_after_upload_file',
	72	+ :options => {:only => 'upload_files'},
	73	+ :block => block }
	74	+ end
	75	+
	76	+ def upload_files_extra_fields(article)
	77	+ proc do
	78	+ @article = Article.find_by_id(article)
	79	+ if params[:parent_id] && !@article.nil? && @article.type == "WorkAssignmentPlugin::WorkAssignment"
	80	+ render :partial => 'notify_text_field', :locals => { :size => '45'}
	81	+ end
	82	+ end
	83	+ end
54	84	end
...	...
...	...	@@ -0,0 +1,64 @@
	1	+class WorkAssignmentPlugin::EmailContact
	2	+
	3	+ include ActiveModel::Validations
	4	+
	5	+ def initialize(attributes = nil)
	6	+ if attributes
	7	+ attributes.each do \|attr,value\|
	8	+ self.send("#{attr}=", value)
	9	+ end
	10	+ end
	11	+ end
	12	+
	13	+ attr_accessor :name
	14	+ attr_accessor :subject
	15	+ attr_accessor :message
	16	+ attr_accessor :email
	17	+ attr_accessor :receive_a_copy
	18	+ attr_accessor :sender
	19	+ attr_accessor :receiver
	20	+
	21	+ N_('Subject'); N_('Message'); N_('e-Mail'); N_('Name')
	22	+
	23	+ validates_presence_of :receiver, :subject, :message, :sender
	24	+ validates_format_of :receiver, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {\|o\| !o.email.blank?})
	25	+
	26	+ def deliver
	27	+ return false unless self.valid?
	28	+ WorkAssignmentPlugin::EmailContact::EmailSender.notification(self).deliver
	29	+ end
	30	+
	31	+ class EmailSender < ActionMailer::Base
	32	+
	33	+ def notification(email_contact)
	34	+ name = email_contact.sender.name
	35	+ email = email_contact.sender.email
	36	+ message = email_contact.message
	37	+ target = email_contact.receiver
	38	+
	39	+ options = {
	40	+ content_type: 'text/html',
	41	+ to: target,
	42	+ reply_to: email,
	43	+ subject: email_contact.subject,
	44	+ body: message,
	45	+ from: "#{email_contact.sender.environment.name} <#{email_contact.sender.environment.contact_email}>",
	46	+ }
	47	+
	48	+ mail(options)
	49	+ end
	50	+
	51	+ def build_mail_message(email_contact, uploaded_files)
	52	+ message = ""
	53	+ if uploaded_files && uploaded_files.first && uploaded_files.first.parent && uploaded_files.first.parent.parent
	54	+ article = uploaded_files.first.parent.parent
	55	+ message = article.default_email + "<br>"
	56	+ uploaded_files.each do \|file\|
	57	+ url = url_for(file.url)
	58	+ message += "<br><a href='#{url}'>#{url}</a>"
	59	+ end
	60	+ end
	61	+ email_contact.message = message
	62	+ end
	63	+ end
	64	+end
...	...
1	1	module WorkAssignmentPlugin::Helper
	2	+ include CmsHelper
	3	+
2	4	def display_submissions(work_assignment, user)
3	5	return if work_assignment.submissions.empty?
4	6	content_tag('table',
...	...	@@ -6,6 +8,7 @@ module WorkAssignmentPlugin::Helper
6	8	content_tag('th', c_('Author'), :style => 'width: 50%') +
7	9	content_tag('th', _('Submission date')) +
8	10	content_tag('th', _('Versions'), :style => 'text-align: center') +
	11	+ content_tag('th', '') +
9	12	content_tag('th', '')
10	13	).html_safe +
11	14	work_assignment.children.map {\|author_folder\| display_author_folder(author_folder, user)}.join("\n").html_safe
...	...	@@ -18,7 +21,8 @@ module WorkAssignmentPlugin::Helper
18	21	content_tag('td', link_to_last_submission(author_folder, user)) +
19	22	content_tag('td', time_format(author_folder.children.last.created_at)) +
20	23	content_tag('td', author_folder.children.count, :style => 'text-align: center') +
21		- content_tag('td', content_tag('button', _('View all versions'), :class => 'view-author-versions', 'data-folder-id' => author_folder.id))
	24	+ content_tag('td', content_tag('button', _('View all versions'), :class => 'view-author-versions', 'data-folder-id' => author_folder.id)) +
	25	+ content_tag('td', display_privacy_button(author_folder, user))
22	26	).html_safe +
23	27	author_folder.children.map {\|submission\| display_submission(submission, user)}.join("\n").html_safe
24	28	end
...	...	@@ -26,7 +30,13 @@ module WorkAssignmentPlugin::Helper
26	30	def display_submission(submission, user)
27	31	content_tag('tr',
28	32	content_tag('td', link_to_submission(submission, user)) +
29		- content_tag('td', time_format(submission.created_at), :colspan => 3),
	33	+ content_tag('td', time_format(submission.created_at))+
	34	+ content_tag('td', '') +
	35	+ content_tag('td',
	36	+ if submission.parent.parent.allow_post_content?(user)
	37	+ display_delete_button(submission)
	38	+ end
	39	+ ),
30	40	:class => "submission-from-#{submission.parent.id}",
31	41	:style => 'display: none'
32	42	)
...	...	@@ -40,7 +50,6 @@ module WorkAssignmentPlugin::Helper
40	50	end
41	51	end
42	52
43		-
44	53	def link_to_last_submission(author_folder, user)
45	54	if WorkAssignmentPlugin.can_download_submission?(user, author_folder.children.last)
46	55	link_to(author_folder.name, author_folder.children.last.url)
...	...	@@ -48,6 +57,7 @@ module WorkAssignmentPlugin::Helper
48	57	author_folder.name
49	58	end
50	59	end
	60	+
51	61	# FIXME Copied from custom-froms. Consider passing it to core...
52	62	def time_format(time)
53	63	minutes = (time.min == 0) ? '' : ':%M'
...	...	@@ -56,4 +66,28 @@ module WorkAssignmentPlugin::Helper
56	66	time.strftime("%Y-%m-%d#{hour+minutes+h}")
57	67	end
58	68
	69	+ def display_delete_button(article)
	70	+ expirable_button article, :delete, _('Delete'),
	71	+ {:controller =>'cms', :action => 'destroy', :id => article.id },
	72	+ :method => :post, :confirm => delete_article_message(article)
	73	+ end
	74	+
	75	+ def display_privacy_button(author_folder, user)
	76	+ folder = environment.articles.find_by_id(author_folder.id)
	77	+ work_assignment = folder.parent
	78	+ @back_to = url_for(work_assignment.url)
	79	+
	80	+ if(user && work_assignment.allow_visibility_edition &&
	81	+ ((author_folder.author_id == user.id && (user.is_member_of? profile)) \|\|
	82	+ user.has_permission?('view_private_content', profile)))
	83	+
	84	+ @tokenized_children = prepare_to_token_input(
	85	+ profile.members.includes(:articles_with_access).find_all{ \|m\|
	86	+ m.articles_with_access.include?(folder)
	87	+ })
	88	+ button :edit, _('Edit'), { :controller => 'work_assignment_plugin_myprofile',
	89	+ :action => 'edit_visibility', :article_id => folder.id,
	90	+ :tokenized_children => @tokenized_children, :back_to => @back_to}, :method => :post
	91	+ end
	92	+ end
59	93	end
...	...