Merge remote branch 'diguliu/features' into work-assignment

Conflicts: test/functional/cms_controller_test.rb test/unit/article_test.rb

Merge remote branch 'diguliu/features' into work-assignment
Conflicts: test/functional/cms_controller_test.rb test/unit/article_test.rb
Daniela Feitosa
2 parents 43e837c4 fe47b515
Showing 30 changed files with 523 additions and 64 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/content_viewer_helper.rb
app/helpers/folder_helper.rb
app/helpers/forms_helper.rb
app/models/approve_article.rb
app/models/article.rb
app/models/event.rb
app/models/raw_html_article.rb
app/models/tiny_mce_article.rb
app/views/cms/select_article_type.rhtml
app/views/content_viewer/_article_toolbar.rhtml
db/schema.rb
lib/noosfero/plugin.rb
plugins/work_assignment/lib/ext/uploaded_file.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/show_versions.js
plugins/work_assignment/public/style.css
plugins/work_assignment/test/functional/cms_controller_test.rb
@@ -16,7 +16,13 @@ class CmsController &lt; MyProfileController
  
   before_filter :login_required, :except => [:suggest_an_article]
  
-  protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish] do |c, user, profile|
+  protect_if :only => :upload_files do |c, user, profile|
+    article_id = c.params[:parent_id]
+    (article_id && profile.articles.find(article_id).allow_create?(user)) ||
+    (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] do |c, user, profile|
     user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
   end
  
@@ -92,7 +98,7 @@ class CmsController &lt; MyProfileController
       @article_types = []
       available_article_types.each do |type|
         @article_types.push({
-          :name => type.name,
+          :class => type,
           :short_description => type.short_description,
           :description => type.description
         })
@@ -154,7 +160,7 @@ class CmsController &lt; MyProfileController
     end
     if request.post? && params[:uploaded_files]
       params[:uploaded_files].each do |file|
-        @uploaded_files << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => @parent) unless file == ''
+        @uploaded_files << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => @parent, :last_changed_by => user) unless file == ''
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
       if @errors.any?
@@ -26,7 +26,7 @@ module ContentViewerHelper
       end
       title << content_tag('span',
         content_tag('span', show_date(article.published_at), :class => 'date') +
-        content_tag('span', [_(", by %s") % link_to(article.author_name, article.author.url)], :class => 'author') +
+        content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
         :class => 'created-at'
       )
@@ -52,8 +52,8 @@ module FolderHelper
     end
   end
  
-  def icon_for_new_article(type)
-    "icon-new icon-new%s" % type.constantize.icon_name
+  def icon_for_new_article(klass)
+    "icon-new icon-new%s" % klass.icon_name
   end
  
   def custom_options_for_article(article)
@@ -142,6 +142,38 @@ module FormsHelper
     content_tag('table',rows.join("\n"))
   end
  
+  def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {})
+    root = profile ? profile.identifier : _("root")
+    labelled_form_field(
+      label_text,
+      select_tag(
+        field_id,
+        options_for_select(
+          [[root, '']] +
+          collection.collect {|f| [ root + '/' +  f.full_name, f.id ] },
+          default_value
+        ),
+        html_options.merge(js_options)
+      )
+    )
+  end
+
+  def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
+    result = labelled_form_field(
+      label_text,
+      select_tag(
+        field_id,
+        options_for_select(
+          [[profile.identifier, '']] +
+          profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] },
+          default_value
+        ),
+        html_options.merge(js_options)
+      )
+    )
+    return result
+  end
+
   def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
     datepicker_options[:disabled] ||= false
     datepicker_options[:alt_field] ||= ''
@@ -48,7 +48,7 @@ class ApproveArticle &lt; Task
   end
  
   def perform
-     article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
+    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author)
   end
  
   def title
@@ -13,6 +13,12 @@ class Article &lt; ActiveRecord::Base
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
  
+  before_create do |article|
+    if article.last_changed_by_id
+      article.author_name = Person.find(article.last_changed_by_id).name
+    end
+  end
+
   belongs_to :profile
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
@@ -289,7 +295,7 @@ class Article &lt; ActiveRecord::Base
     if last_comment
       {:date => last_comment.created_at, :author_name => last_comment.author_name, :author_url => last_comment.author_url}
     else
-      {:date => updated_at, :author_name => author.name, :author_url => author.url}
+      {:date => updated_at, :author_name => author_name, :author_url => author_url}
     end
   end
  
@@ -441,7 +447,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   def allow_post_content?(user = nil)
-    user && (user.has_permission?('post_content', profile) || allow_publish_content?(user) && (user == self.creator))
+    user && (user.has_permission?('post_content', profile) || allow_publish_content?(user) && (user == author))
   end
  
   def allow_publish_content?(user = nil)
@@ -496,7 +502,6 @@ class Article &lt; ActiveRecord::Base
     :slug,
     :updated_at,
     :created_at,
-    :last_changed_by_id,
     :version,
     :lock_version,
     :type,
@@ -539,15 +544,20 @@ class Article &lt; ActiveRecord::Base
   end
  
   def author
-    if reference_article
-      reference_article.author
+    if versions.empty?
+      last_changed_by
     else
-      last_changed_by || profile
+      author_id = versions.first.last_changed_by_id
+      Person.exists?(author_id) ? Person.find(author_id) : nil
     end
   end
  
   def author_name
-    setting[:author_name].blank? ? author.name : setting[:author_name]
+    author ? author.name : (setting[:author_name] || _('Unknown'))
+  end
+
+  def author_url
+    author ? author.url : nil
   end
  
   alias :active_record_cache_key :cache_key
@@ -572,11 +582,6 @@ class Article &lt; ActiveRecord::Base
     truncate sanitize_html(self.lead), :length => 170, :omission => '...'
   end
  
-  def creator
-    creator_id = versions[0][:last_changed_by_id]
-    creator_id && Profile.find(creator_id)
-  end
-
   def notifiable?
     false
   end
@@ -38,7 +38,7 @@ class Event &lt; Article
   filter_iframes :body, :link, :address, :whitelist => lambda { profile && profile.environment && profile.environment.trusted_sites_for_iframe }
  
   def self.description
-    _('A calendar event')
+    _('A calendar event.')
   end
  
   def self.short_description
@@ -5,11 +5,11 @@ class RawHTMLArticle &lt; TextArticle
   end
  
   def self.short_description
-    _('Raw HTML text article.')
+    _('Raw HTML text article')
   end
  
   def self.description
-    _('Allows HTML without filter (only for admins)')
+    _('Allows HTML without filter (only for admins).')
   end
  
   xss_terminate :only => [  ]
 class TinyMceArticle < TextArticle
  
   def self.short_description
-    _('Text article with visual editor.')
+    _('Text article with visual editor')
   end
  
   def self.description
@@ -2,9 +2,9 @@
  
 <ul id="article_types">
   <% for type in @article_types %>
-    <% action = type[:name] == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:name]} %>
+    <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>
     <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
-      <li class="<%= icon_for_new_article(type[:name]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
+      <li class="<%= icon_for_new_article(type[:class]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
         <strong><%= type[:short_description] %></strong>
         <div class='description'><%= type[:description] %></div>
       </li>
@@ -34,11 +34,11 @@
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
  
-      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
+      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) if !remove_content_button(:new) %>
     <% end %>
  
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
-      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
+      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) if !remove_content_button(:upload)%>
     <% end %>
  
     <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20121008185303) do
+ActiveRecord::Schema.define(:version => 20121022190819) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -130,7 +130,7 @@ class Noosfero::Plugin
   end
  
   # -> Adds plugin-specific content types to CMS
-  # returns  = { content type class }
+  # returns  = [ContentClass1, ContentClass2, ...]
   def content_types
     nil
   end
@@ -384,7 +384,9 @@ class Noosfero::Plugin
   private
  
   def content_actions
-    %w[edit delete spread locale suggest home]
+    #FIXME 'new' and 'upload' only works for content_remove. It should work for
+    #content_expire too.
+    %w[edit delete spread locale suggest home new upload]
   end
  
 end
@@ -0,0 +1,14 @@
+require_dependency 'article'
+require_dependency 'uploaded_file'
+
+class UploadedFile < Article
+  after_save 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
+      logger.info("\n\n==> #{uploaded_file.name}\n\n")
+      uploaded_file.save!
+    end
+  end
+end
@@ -0,0 +1,54 @@
+require_dependency 'ext/uploaded_file'
+
+class WorkAssignmentPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Work Assignment"
+  end
+
+  def self.plugin_description
+    _("New kind of content for organizations.")
+  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)))
+  end
+
+  def self.is_submission?(content)
+    content && content.parent && content.parent.parent && content.parent.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
+  end
+
+  def content_types
+    [WorkAssignmentPlugin::WorkAssignment] if context.profile.organization?
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def content_remove_new(content)
+    content.kind_of?(WorkAssignmentPlugin::WorkAssignment)
+  end
+
+  def content_remove_upload(content)
+    !content.profile.members.include?(context.send(:user))
+  end
+
+  def content_viewer_controller_filters
+    block = lambda do
+      path = params[:page].join('/')
+      content = profile.articles.find_by_path(path)
+
+      if WorkAssignmentPlugin.is_submission?(content) && !WorkAssignmentPlugin.can_download_submission?(user, content)
+        render_access_denied
+      end
+    end
+
+    { :type => 'before_filter',
+      :method_name => 'work_assingment_only_admin_or_owner_download',
+      :options => {:only => 'view_page'},
+      :block => block }
+  end
+
+end
@@ -0,0 +1,59 @@
+module WorkAssignmentPlugin::Helper
+  def display_submissions(work_assignment, user)
+    return if work_assignment.submissions.empty?
+    content_tag('table',
+      content_tag('tr',
+        content_tag('th', _('Author'), :style => 'width: 50%') +
+        content_tag('th', _('Submission date')) +
+        content_tag('th', _('Versions'), :style => 'text-align: center') +
+        content_tag('th', '')
+      ) +
+      work_assignment.children.map {|author_folder| display_author_folder(author_folder, user)}.join("\n")
+    )
+  end
+
+  def display_author_folder(author_folder, user)
+    return if author_folder.children.empty?
+    content_tag('tr',
+      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))
+    ) +
+    author_folder.children.map {|submission| display_submission(submission, user)}.join("\n")
+  end
+
+  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),
+      :class => "submission-from-#{submission.parent.id}",
+      :style => 'display: none'
+    )
+  end
+
+  def link_to_submission(submission, user)
+    if WorkAssignmentPlugin.can_download_submission?(user, submission)
+      link_to(submission.name, submission.url)
+    else
+      submission.name
+    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)
+    else
+      author_folder.name
+    end
+  end
+  # FIXME Copied from custom-froms. Consider passing it to core...
+  def time_format(time)
+    minutes = (time.min == 0) ? '' : ':%M'
+    hour = (time.hour == 0 && minutes.blank?) ? '' : ' %H'
+    h = hour.blank? ? '' : 'h'
+    time.strftime("%Y-%m-%d#{hour+minutes+h}")
+  end
+
+end
@@ -0,0 +1,48 @@
+class WorkAssignmentPlugin::WorkAssignment < Folder
+
+  settings_items :publish_submissions, :type => :boolean, :default => false
+
+  def self.icon_name(article = nil)
+    'work-assignment'
+  end
+
+  def self.short_description
+    _('Work Assignment')
+  end
+
+  def self.description
+    _('Defines a work to be done by the members and receives their submissions about this work.')
+  end
+
+  def self.versioned_name(submission, folder)
+    "(V#{folder.children.count + 1}) #{submission.name}"
+  end
+
+  def accept_comments?
+    true
+  end
+
+  def allow_create?(user)
+    profile.members.include?(user)
+  end
+
+  def to_html(options = {})
+    lambda do
+      render :file => 'content_viewer/work_assignment.html.erb'
+    end
+  end
+
+  def find_or_create_author_folder(author)
+    children.find_by_slug(author.identifier.to_slug) || Folder.create!(:name => author.name, :slug => author.identifier.to_slug, :parent => self, :profile => profile)
+  end
+
+  def submissions
+    children.map(&:children).flatten.compact
+  end
+
+  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
+
+end
@@ -0,0 +1,16 @@
+jQuery(".view-author-versions").each(function(index, bt){
+  jQuery(bt).button({
+    icons: {
+      primary: "ui-icon-info"
+    },
+    text: false
+  });
+  bt.onclick = function(){
+    var folderId = this.getAttribute("data-folder-id");
+    var tr = jQuery(".submission-from-"+folderId);
+    if ( tr[0].style.display == "none" )
+      tr.show();
+    else
+      tr.hide();
+  }
+});
@@ -0,0 +1,2 @@
+.icon-newwork-assignment { background-image: url(../../designs/icons/tango/Tango/16x16/categories/applications-office.png) }
+.icon-work-assignment { background-image: url(../../designs/icons/tango/Tango/16x16/categories/applications-office.png) }
@@ -0,0 +1,44 @@
+require 'test_helper'
+require 'cms_controller'
+
+# Re-raise errors caught by the controller.
+class CmsController; def rescue_action(e) raise e end; end
+
+class CmsControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = CmsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = create_user('test_user').person
+    login_as :test_user
+  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
+    assert_response :forbidden
+    assert_template 'access_denied.rhtml'
+
+    organization.add_member(person)
+
+    get :upload_files, :profile => organization.identifier, :parent_id => work_assignment.id
+    assert_response :success
+  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')]
+
+    submission = UploadedFile.last
+    assert_equal work_assignment.find_or_create_author_folder(person), submission.parent
+  end
+
+end
+
@@ -0,0 +1,41 @@
+require 'test_helper'
+require 'content_viewer_controller'
+
+# Re-raise errors caught by the controller.
+class ContentViewerController; def rescue_action(e) raise e end; end
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ContentViewerController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @organization = fast_create(Organization)
+    @work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => @organization)
+    @person = create_user('test_user').person
+    @environment = @organization.environment
+    @environment.enable_plugin(WorkAssignmentPlugin)
+    @environment.save!
+    login_as(:test_user)
+  end
+  attr_reader :organization, :person, :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)
+    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.explode_path
+    assert_response :forbidden
+    assert_template 'access_denied.rhtml'
+
+    WorkAssignmentPlugin.stubs(:can_download_submission?).returns(true)
+
+    get :view_page, :profile => organization.identifier, :page => submission.explode_path
+    assert_response :success
+  end
+
+end
@@ -0,0 +1,55 @@
+require "test_helper"
+
+class WorkAssignmentTest < ActiveSupport::TestCase
+  should 'find or create sub-folder based on author identifier' do
+    profile = fast_create(Profile)
+    author = fast_create(Person)
+    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Sample Work Assignment', :profile => profile)
+    assert_nil work_assignment.children.find_by_slug(author.identifier)
+
+    folder = work_assignment.find_or_create_author_folder(author)
+    assert_not_nil work_assignment.children.find_by_slug(author.identifier)
+    assert_equal folder, work_assignment.find_or_create_author_folder(author)
+  end
+
+  should 'return versioned name' do
+    profile = fast_create(Profile)
+    folder = fast_create(Folder, :profile_id => profile)
+    a1 = Article.create!(:name => "Article 1", :profile => profile)
+    a2 = Article.create!(:name => "Article 2", :profile => profile)
+    a3 = Article.create!(:name => "Article 3", :profile => profile)
+    klass = WorkAssignmentPlugin::WorkAssignment
+
+    assert_equal "(V1) #{a1.name}", klass.versioned_name(a1, folder)
+
+    a1.parent = folder
+    a1.save!
+    assert_equal "(V2) #{a2.name}", klass.versioned_name(a2, folder)
+
+    a2.parent = folder
+    a2.save!
+    assert_equal "(V3) #{a3.name}", klass.versioned_name(a3, folder)
+  end
+
+  should 'move submission to its correct author folder' do
+    organization = fast_create(Organization)
+    author = fast_create(Person)
+    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Sample Work Assignment', :profile => organization)
+    submission = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => organization, :parent => work_assignment, :last_changed_by => author)
+
+    author_folder = work_assignment.find_or_create_author_folder(author)
+    assert author_folder, submission.parent
+  end
+
+  should 'add logged user on cache_key if is a member' do
+    organization = fast_create(Organization)
+    not_member = fast_create(Person)
+    member = fast_create(Person)
+    organization.add_member(member)
+    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Sample Work Assignment', :profile => organization)
+
+    assert_no_match(/-#{not_member.identifier}/, work_assignment.cache_key({}, not_member))
+    assert_match(/-#{member.identifier}/, work_assignment.cache_key({}, member))
+  end
+
+end
@@ -0,0 +1,54 @@
+require 'test_helper'
+
+class WorkAssignmentPluginTest < ActiveSupport::TestCase
+  should 'verify if a content is a work_assignment submission' do
+    organization = fast_create(Organization)
+    content = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => organization, :last_changed_by => fast_create(Person))
+    assert !WorkAssignmentPlugin.is_submission?(content)
+
+    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
+    content.parent = work_assignment
+    content.save!
+    assert WorkAssignmentPlugin.is_submission?(content)
+
+    author_folder = work_assignment.find_or_create_author_folder(content.author)
+    assert_equal author_folder, content.parent
+  end
+
+  should 'be able to download submission if work_assignment published submissions' do
+    submission = create_submission
+    assert !WorkAssignmentPlugin.can_download_submission?(nil, submission)
+
+    work_assignment = submission.parent.parent
+    work_assignment.publish_submissions = true
+    work_assignment.save!
+    assert WorkAssignmentPlugin.can_download_submission?(nil, submission)
+  end
+
+  should 'be able to download submission if the user is author of it' do
+    person = fast_create(Person)
+    submission = create_submission
+    assert !WorkAssignmentPlugin.can_download_submission?(person, submission)
+
+    submission = create_submission(person)
+    assert WorkAssignmentPlugin.can_download_submission?(person, submission)
+  end
+
+  should 'be able to download submission if the user has the view_private_content permission on the profile' do
+    person = fast_create(Person)
+    submission = create_submission
+    assert !WorkAssignmentPlugin.can_download_submission?(person, submission)
+
+    moderator = create_user_with_permission('moderator', 'view_private_content', submission.profile)
+    assert WorkAssignmentPlugin.can_download_submission?(moderator, submission)
+  end
+
+  private
+
+  def create_submission(author=nil)
+    organization = fast_create(Organization)
+    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
+    author_folder = work_assignment.find_or_create_author_folder(fast_create(Person))
+    UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => organization, :parent => author_folder, :last_changed_by => author)
+  end
+end
@@ -0,0 +1,3 @@
+<%= render :partial => 'folder', :locals => {:f => f} %>
+
+<%= f.check_box(:publish_submissions) %>
@@ -0,0 +1,10 @@
+<% extend WorkAssignmentPlugin::Helper %>
+
+<% unless @page.body.blank? %>
+  <div><%= @page.body %></div>
+  <hr/>
+<% end %>
+
+<%= display_submissions(@page, user) %>
+
+<%= javascript_include_tag '../plugins/work_assignment/show_versions' %>
@@ -1583,6 +1583,28 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal f2, article.parent
   end
  
+  should 'set author when creating article' do
+    login_as(profile.identifier)
+
+    post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'Sample Article', :body => 'content ...' }
+
+    a = profile.articles.find_by_path('sample-article')
+    assert_not_nil a
+    assert_equal profile, a.author
+  end
+
+  should 'not allow user upload files if he can not create on the parent folder' do
+    c = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
+    u = create_user('test_user')
+    a = c.articles.create!(:name => 'test_article')
+    a.stubs(:allow_create?).with(u).returns(true)
+    login_as :test_user
+
+    get :upload_files, :profile => c.identifier, :parent_id => a.id
+    assert_response :forbidden
+    assert_template 'access_denied.rhtml'
+  end
+
   protected
  
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -210,22 +210,21 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
   end
  
   should 'use author from original article on published' do
-    article.stubs(:last_changed_by_id).returns(profile)
-
+    article.class.any_instance.stubs(:author).returns(profile)
     a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
     a.finish
  
     assert_equal profile, article.class.last.author
   end
  
-
-  should 'use owning profile as author when there is no referenced article' do
+  should 'use original article author even if article is destroyed' do
+    article.class.any_instance.stubs(:author).returns(profile)
     a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
     a.finish
  
     article.destroy
  
-    assert_equal community, article.class.last.author
+    assert_equal profile, article.class.last.author
   end
  
   should 'the published article have parent if defined' do
@@ -708,14 +708,6 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal a.url, a.view_url
   end
  
-  should 'know its author' do
-    assert_equal profile, Article.new(:last_changed_by => profile).author
-  end
-
-  should 'use owning profile as author when we dont know who did the last change' do
-    assert_equal profile, Article.new(:last_changed_by => nil, :profile => profile).author
-  end
-
   should 'have published_at' do
     assert_respond_to Article.new, :published_at
   end
@@ -791,15 +783,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_match(/-owner/, a.cache_key({}, c))
   end
  
-  should 'have a creator method' do
-    c = fast_create(Community)
-    a = c.articles.create!(:name => 'a test article', :last_changed_by => profile)
-    p = create_user('other_user').person
-    a.update_attributes(:body => 'some content', :last_changed_by => p); a.save!
-    assert_equal profile, a.creator
-  end
-
-  should 'allow creator to edit if is publisher' do
+  should 'allow author to edit if is publisher' do
     c = fast_create(Community)
     p = create_user_with_permission('test_user', 'publish_content', c)
     a = c.articles.create!(:name => 'a test article', :last_changed_by => p)
@@ -1372,19 +1356,18 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert Article.method_defined?('author_name')
   end
  
-  should "the author_name returns the name od the article's author" do
-    author = mock()
-    author.expects(:name).returns('author name')
-    a = Article.new
-    a.expects(:author).returns(author)
-    assert_equal 'author name', a.author_name
+  should "the author_name returns the name of the article's author" do
+    author = fast_create(Person)
+    a = profile.articles.create!(:name => 'a test article', :last_changed_by => author)
+    assert_equal author.name, a.author_name
+    author.destroy
     a.author_name = 'some name'
     assert_equal 'some name', a.author_name
   end
  
   should 'retrieve latest info from topic when has no comments' do
     forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)
-    post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now)
+    post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now, :last_changed_by_id => profile.id)
     assert_equal post.updated_at, post.info_from_last_update[:date]
     assert_equal profile.name, post.info_from_last_update[:author_name]
     assert_equal profile.url, post.info_from_last_update[:author_url]
@@ -1818,4 +1801,15 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert a1.errors.invalid?(:parent_id)
   end
  
+  should 'set author_name before creating article if there is an author' do
+    author = fast_create(Person)
+    article = Article.create!(:name => 'Test', :profile => profile, :last_changed_by => author)
+    assert_equal author.name, article.author_name
+
+    author_name = author.name
+    author.destroy
+    article.reload
+    assert_equal author_name, article.author_name
+  end
+
 end
@@ -33,7 +33,7 @@ class FolderHelperTest &lt; ActiveSupport::TestCase
  
   should 'display icon for type of article' do
     Article.expects(:icon_name).returns('article')
-    assert_match /icon-newarticle/, icon_for_new_article('Article')
+    assert_match /icon-newarticle/, icon_for_new_article(Article)
   end
  
   should 'list all the folder\'s children to the owner' do
@@ -29,17 +29,16 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
   end
  
   should 'list posts with different classes' do
-    forum.children << older_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => forum, :published => false)
+    forum.children << older_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => forum, :published => false, :last_changed_by => profile)
     one_month_later = Time.now + 1.month
     Time.stubs(:now).returns(one_month_later)
-    forum.children << newer_post = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => forum, :published => true)
+    forum.children << newer_post = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => forum, :published => true, :last_changed_by => profile)
     assert_match /forum-post position-1 first odd-post.*forum-post position-2 last not-published even-post/, list_forum_posts(forum.posts)
   end
  
   should 'return post update if it has no comments' do
     author = create_user('forum test author').person
-    some_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => forum, :published => true)
-    some_post.expects(:author).returns(author).times(2)
+    some_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => forum, :published => true, :last_changed_by => author)
     assert some_post.comments.empty?
     out = last_topic_update(some_post)
     assert_match some_post.updated_at.to_s, out
...	...	@@ -16,7 +16,13 @@ class CmsController < MyProfileController
16	16
17	17	before_filter :login_required, :except => [:suggest_an_article]
18	18
19		- protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish] do \|c, user, profile\|
	19	+ protect_if :only => :upload_files do \|c, user, profile\|
	20	+ article_id = c.params[:parent_id]
	21	+ (article_id && profile.articles.find(article_id).allow_create?(user)) \|\|
	22	+ (user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile)))
	23	+ end
	24	+
	25	+ protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files] do \|c, user, profile\|
20	26	user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile))
21	27	end
22	28
...	...	@@ -92,7 +98,7 @@ class CmsController < MyProfileController
92	98	@article_types = []
93	99	available_article_types.each do \|type\|
94	100	@article_types.push({
95		- :name => type.name,
	101	+ :class => type,
96	102	:short_description => type.short_description,
97	103	:description => type.description
98	104	})
...	...	@@ -154,7 +160,7 @@ class CmsController < MyProfileController
154	160	end
155	161	if request.post? && params[:uploaded_files]
156	162	params[:uploaded_files].each do \|file\|
157		- @uploaded_files << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => @parent) unless file == ''
	163	+ @uploaded_files << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => @parent, :last_changed_by => user) unless file == ''
158	164	end
159	165	@errors = @uploaded_files.select { \|f\| f.errors.any? }
160	166	if @errors.any?
...	...
...	...	@@ -26,7 +26,7 @@ module ContentViewerHelper
26	26	end
27	27	title << content_tag('span',
28	28	content_tag('span', show_date(article.published_at), :class => 'date') +
29		- content_tag('span', [_(", by %s") % link_to(article.author_name, article.author.url)], :class => 'author') +
	29	+ content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
30	30	content_tag('span', comments, :class => 'comments'),
31	31	:class => 'created-at'
32	32	)
...	...
...	...	@@ -52,8 +52,8 @@ module FolderHelper
52	52	end
53	53	end
54	54
55		- def icon_for_new_article(type)
56		- "icon-new icon-new%s" % type.constantize.icon_name
	55	+ def icon_for_new_article(klass)
	56	+ "icon-new icon-new%s" % klass.icon_name
57	57	end
58	58
59	59	def custom_options_for_article(article)
...	...
...	...	@@ -142,6 +142,38 @@ module FormsHelper
142	142	content_tag('table',rows.join("\n"))
143	143	end
144	144
	145	+ def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {})
	146	+ root = profile ? profile.identifier : _("root")
	147	+ labelled_form_field(
	148	+ label_text,
	149	+ select_tag(
	150	+ field_id,
	151	+ options_for_select(
	152	+ [[root, '']] +
	153	+ collection.collect {\|f\| [ root + '/' + f.full_name, f.id ] },
	154	+ default_value
	155	+ ),
	156	+ html_options.merge(js_options)
	157	+ )
	158	+ )
	159	+ end
	160	+
	161	+ def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
	162	+ result = labelled_form_field(
	163	+ label_text,
	164	+ select_tag(
	165	+ field_id,
	166	+ options_for_select(
	167	+ [[profile.identifier, '']] +
	168	+ profile.folders.collect {\|f\| [ profile.identifier + '/' + f.full_name, f.id ] },
	169	+ default_value
	170	+ ),
	171	+ html_options.merge(js_options)
	172	+ )
	173	+ )
	174	+ return result
	175	+ end
	176	+
145	177	def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
146	178	datepicker_options[:disabled] \|\|= false
147	179	datepicker_options[:alt_field] \|\|= ''
...	...
...	...	@@ -48,7 +48,7 @@ class ApproveArticle < Task
48	48	end
49	49
50	50	def perform
51		- article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
	51	+ article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author)
52	52	end
53	53
54	54	def title
...	...
...	...	@@ -13,6 +13,12 @@ class Article < ActiveRecord::Base
13	13	# xss_terminate plugin can't sanitize array fields
14	14	before_save :sanitize_tag_list
15	15
	16	+ before_create do \|article\|
	17	+ if article.last_changed_by_id
	18	+ article.author_name = Person.find(article.last_changed_by_id).name
	19	+ end
	20	+ end
	21	+
16	22	belongs_to :profile
17	23	validates_presence_of :profile_id, :name
18	24	validates_presence_of :slug, :path, :if => lambda { \|article\| !article.name.blank? }
...	...	@@ -289,7 +295,7 @@ class Article < ActiveRecord::Base
289	295	if last_comment
290	296	{:date => last_comment.created_at, :author_name => last_comment.author_name, :author_url => last_comment.author_url}
291	297	else
292		- {:date => updated_at, :author_name => author.name, :author_url => author.url}
	298	+ {:date => updated_at, :author_name => author_name, :author_url => author_url}
293	299	end
294	300	end
295	301
...	...	@@ -441,7 +447,7 @@ class Article < ActiveRecord::Base
441	447	end
442	448
443	449	def allow_post_content?(user = nil)
444		- user && (user.has_permission?('post_content', profile) \|\| allow_publish_content?(user) && (user == self.creator))
	450	+ user && (user.has_permission?('post_content', profile) \|\| allow_publish_content?(user) && (user == author))
445	451	end
446	452
447	453	def allow_publish_content?(user = nil)
...	...	@@ -496,7 +502,6 @@ class Article < ActiveRecord::Base
496	502	:slug,
497	503	:updated_at,
498	504	:created_at,
499		- :last_changed_by_id,
500	505	:version,
501	506	:lock_version,
502	507	:type,
...	...	@@ -539,15 +544,20 @@ class Article < ActiveRecord::Base
539	544	end
540	545
541	546	def author
542		- if reference_article
543		- reference_article.author
	547	+ if versions.empty?
	548	+ last_changed_by
544	549	else
545		- last_changed_by \|\| profile
	550	+ author_id = versions.first.last_changed_by_id
	551	+ Person.exists?(author_id) ? Person.find(author_id) : nil
546	552	end
547	553	end
548	554
549	555	def author_name
550		- setting[:author_name].blank? ? author.name : setting[:author_name]
	556	+ author ? author.name : (setting[:author_name] \|\| _('Unknown'))
	557	+ end
	558	+
	559	+ def author_url
	560	+ author ? author.url : nil
551	561	end
552	562
553	563	alias :active_record_cache_key :cache_key
...	...	@@ -572,11 +582,6 @@ class Article < ActiveRecord::Base
572	582	truncate sanitize_html(self.lead), :length => 170, :omission => '...'
573	583	end
574	584
575		- def creator
576		- creator_id = versions[0][:last_changed_by_id]
577		- creator_id && Profile.find(creator_id)
578		- end
579		-
580	585	def notifiable?
581	586	false
582	587	end
...	...
...	...	@@ -38,7 +38,7 @@ class Event < Article
38	38	filter_iframes :body, :link, :address, :whitelist => lambda { profile && profile.environment && profile.environment.trusted_sites_for_iframe }
39	39
40	40	def self.description
41		- _('A calendar event')
	41	+ _('A calendar event.')
42	42	end
43	43
44	44	def self.short_description
...	...
...	...	@@ -5,11 +5,11 @@ class RawHTMLArticle < TextArticle
5	5	end
6	6
7	7	def self.short_description
8		- _('Raw HTML text article.')
	8	+ _('Raw HTML text article')
9	9	end
10	10
11	11	def self.description
12		- _('Allows HTML without filter (only for admins)')
	12	+ _('Allows HTML without filter (only for admins).')
13	13	end
14	14
15	15	xss_terminate :only => [ ]
...	...
1	1	class TinyMceArticle < TextArticle
2	2
3	3	def self.short_description
4		- _('Text article with visual editor.')
	4	+ _('Text article with visual editor')
5	5	end
6	6
7	7	def self.description
...	...
...	...	@@ -2,9 +2,9 @@
2	2
3	3	<ul id="article_types">
4	4	<% for type in @article_types %>
5		- <% action = type[:name] == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:name]} %>
	5	+ <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>
6	6	<% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
7		- <li class="<%= icon_for_new_article(type[:name]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
	7	+ <li class="<%= icon_for_new_article(type[:class]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
8	8	<strong><%= type[:short_description] %></strong>
9	9	<div class='description'><%= type[:description] %></div>
10	10	</li>
...	...