Merge branch 'work-assignment' into features

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

Merge branch 'work-assignment' into features
Conflicts: db/schema.rb test/functional/cms_controller_test.rb test/unit/article_test.rb
Rodrigo Souto
2 parents 56e1b119 7358e1d0
Showing 27 changed files with 482 additions and 41 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/folder_helper.rb
app/models/article.rb
app/models/event.rb
app/models/person.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/migrate/20121024220349_add_author_id_to_article.rb
db/migrate/20121024222938_set_authors_based_on_article_versions.rb
db/schema.rb
lib/noosfero/plugin.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
plugins/work_assignment/test/functional/content_viewer_controller_test.rb
@@ -16,7 +16,12 @@ 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]
+    profile.articles.find(article_id).allow_create?(user)
+  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 +97,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
         })
@@ -117,6 +122,7 @@ class CmsController &lt; MyProfileController
     end
  
     @article.profile = profile
+    @article.author = user
     @article.last_changed_by = user
  
     translations if @article.translatable?
@@ -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, :author => user) unless file == ''
       end
       @errors = @uploaded_files.select { |f| f.errors.any? }
       if @errors.any?
@@ -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)
@@ -13,6 +13,12 @@ class Article &lt; ActiveRecord::Base
   # xss_terminate plugin can't sanitize array fields
   before_save :sanitize_tag_list
  
+  before_save do |article|
+    if article.author_id
+      article.author_name = Person.find(article.author_id).name
+    end
+  end
+
   belongs_to :profile
   validates_presence_of :profile_id, :name
   validates_presence_of :slug, :path, :if => lambda { |article| !article.name.blank? }
@@ -20,6 +26,7 @@ class Article &lt; ActiveRecord::Base
   validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { |article| !article.slug.blank? }
  
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
+  belongs_to :author, :class_name => 'Person', :foreign_key => 'author_id'
  
   has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
  
@@ -289,7 +296,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 ? author.url : nil}
     end
   end
  
@@ -441,7 +448,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)
@@ -538,16 +545,8 @@ class Article &lt; ActiveRecord::Base
     false
   end
  
-  def author
-    if reference_article
-      reference_article.author
-    else
-      last_changed_by || profile
-    end
-  end
-
   def author_name
-    setting[:author_name].blank? ? author.name : setting[:author_name]
+    author ? author.name : setting[:author_name]
   end
  
   alias :active_record_cache_key :cache_key
@@ -572,11 +571,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
@@ -54,6 +54,8 @@ class Person &lt; Profile
  
   has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
  
+  has_many :creations, :class_name => 'Article', :foreign_key => :author_id
+
   named_scope :more_popular,
       :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
       :group => Profile.qualified_column_names,
@@ -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) %>
@@ -0,0 +1,11 @@
+class AddAuthorIdToArticle < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :author_id, :integer
+    add_column :article_versions, :author_id, :integer
+  end
+
+  def self.down
+    remove_column :articles, :author_id
+    remove_column :article_versions, :author_id, :integer
+  end
+end
@@ -0,0 +1,9 @@
+class SetAuthorsBasedOnArticleVersions < ActiveRecord::Migration
+  def self.up
+    update('UPDATE articles SET author_id = (SELECT profiles.id FROM articles as a INNER JOIN article_versions ON a.id = article_versions.article_id INNER JOIN profiles ON profiles.id = article_versions.last_changed_by_id WHERE article_versions.version = 1 AND articles.id = a.id)')
+  end
+
+  def self.down
+    say "Can not be revesed!"
+  end
+end
@@ -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 => 20121024222938) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -86,6 +86,7 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
+    t.integer  "author_id"
   end
  
   create_table "articles", :force => true do |t|
@@ -127,6 +128,7 @@ ActiveRecord::Schema.define(:version =&gt; 20121008185303) do
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
+    t.integer  "author_id"
   end
  
   add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_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,52 @@
+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,52 @@
+class WorkAssignmentPlugin::WorkAssignment < Folder
+
+  after_save do |work_assignment|
+    work_assignment.children.select {|child| child.kind_of?(UploadedFile)}.each do |submission|
+      author_folder = work_assignment.find_or_create_author_folder(submission.author)
+      submission.name = versioned_name(submission, author_folder) if !(submission.name =~ /\(V[0-9]*\)/)
+      submission.parent = author_folder
+      submission.save!
+    end
+  end
+
+  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) || Folder.create!(:name => author.name, :slug => author.identifier, :parent => self, :profile => profile)
+  end
+
+  def submissions
+    children.map(&:children).flatten.compact
+  end
+
+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,34 @@
+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
+
+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,43 @@
+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
+    folder = fast_create(Folder)
+    profile = fast_create(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, :author => author)
+
+    author_folder = work_assignment.find_or_create_author_folder(author)
+    assert author_folder, submission.parent
+  end
+end
@@ -0,0 +1,57 @@
+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)
+    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(fast_create(Person))
+    content.parent = author_folder
+    content.save!
+    assert WorkAssignmentPlugin.is_submission?(content)
+  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.author = person
+    submission.save!
+    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
+    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)
+  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.
@@ -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
@@ -1372,7 +1364,7 @@ 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
+  should "the author_name returns the name of the article's author" do
     author = mock()
     author.expects(:name).returns('author name')
     a = Article.new
@@ -1818,4 +1810,25 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert a1.errors.invalid?(:parent_id)
   end
  
+  should 'be able to have an author' do
+    author = fast_create(Person)
+    article = Article.new
+    assert_nothing_raised do
+      article.author = author
+    end
+  end
+
+  should 'set author_name before saving article if there is an author' do
+    author = fast_create(Person)
+    article = fast_create(Article, :profile_id => fast_create(Profile).id)
+    article.author = author
+    article.save!
+    assert_equal author.name, article.author_name
+
+    author_name = author.name
+    author.destroy
+    article.reload
+    assert_equal author_name, article.author_name
+  end
+
 end
@@ -1262,4 +1262,15 @@ class PersonTest &lt; ActiveSupport::TestCase
  
     assert person.has_permission?('bli', Profile.new)
   end
+
+  should 'have creations' do
+    person = create_user('some-user').person
+    a1 = fast_create(Article, :author_id => person.id)
+    a2 = fast_create(Article, :author_id => person.id)
+    a3 = fast_create(Article)
+
+    assert_includes person.creations, a1
+    assert_includes person.creations, a2
+    assert_not_includes person.creations, a3
+  end
 end
...	...	@@ -16,7 +16,12 @@ 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	+ profile.articles.find(article_id).allow_create?(user)
	22	+ end
	23	+
	24	+ protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish, :upload_files] do \|c, user, profile\|
20	25	user && (user.has_permission?('post_content', profile) \|\| user.has_permission?('publish_content', profile))
21	26	end
22	27
...	...	@@ -92,7 +97,7 @@ class CmsController < MyProfileController
92	97	@article_types = []
93	98	available_article_types.each do \|type\|
94	99	@article_types.push({
95		- :name => type.name,
	100	+ :class => type,
96	101	:short_description => type.short_description,
97	102	:description => type.description
98	103	})
...	...	@@ -117,6 +122,7 @@ class CmsController < MyProfileController
117	122	end
118	123
119	124	@article.profile = profile
	125	+ @article.author = user
120	126	@article.last_changed_by = user
121	127
122	128	translations if @article.translatable?
...	...	@@ -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, :author => user) unless file == ''
158	164	end
159	165	@errors = @uploaded_files.select { \|f\| f.errors.any? }
160	166	if @errors.any?
...	...
...	...	@@ -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)
...	...
...	...	@@ -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_save do \|article\|
	17	+ if article.author_id
	18	+ article.author_name = Person.find(article.author_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? }
...	...	@@ -20,6 +26,7 @@ class Article < ActiveRecord::Base
20	26	validates_uniqueness_of :slug, :scope => ['profile_id', 'parent_id'], :message => N_('The title (article name) is already being used by another article, please use another title.'), :if => lambda { \|article\| !article.slug.blank? }
21	27
22	28	belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
	29	+ belongs_to :author, :class_name => 'Person', :foreign_key => 'author_id'
23	30
24	31	has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
25	32
...	...	@@ -289,7 +296,7 @@ class Article < ActiveRecord::Base
289	296	if last_comment
290	297	{:date => last_comment.created_at, :author_name => last_comment.author_name, :author_url => last_comment.author_url}
291	298	else
292		- {:date => updated_at, :author_name => author.name, :author_url => author.url}
	299	+ {:date => updated_at, :author_name => author_name, :author_url => author ? author.url : nil}
293	300	end
294	301	end
295	302
...	...	@@ -441,7 +448,7 @@ class Article < ActiveRecord::Base
441	448	end
442	449
443	450	def allow_post_content?(user = nil)
444		- user && (user.has_permission?('post_content', profile) \|\| allow_publish_content?(user) && (user == self.creator))
	451	+ user && (user.has_permission?('post_content', profile) \|\| allow_publish_content?(user) && (user == author))
445	452	end
446	453
447	454	def allow_publish_content?(user = nil)
...	...	@@ -538,16 +545,8 @@ class Article < ActiveRecord::Base
538	545	false
539	546	end
540	547
541		- def author
542		- if reference_article
543		- reference_article.author
544		- else
545		- last_changed_by \|\| profile
546		- end
547		- end
548		-
549	548	def author_name
550		- setting[:author_name].blank? ? author.name : setting[:author_name]
	549	+ author ? author.name : setting[:author_name]
551	550	end
552	551
553	552	alias :active_record_cache_key :cache_key
...	...	@@ -572,11 +571,6 @@ class Article < ActiveRecord::Base
572	571	truncate sanitize_html(self.lead), :length => 170, :omission => '...'
573	572	end
574	573
575		- def creator
576		- creator_id = versions[0][:last_changed_by_id]
577		- creator_id && Profile.find(creator_id)
578		- end
579		-
580	574	def notifiable?
581	575	false
582	576	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
...	...
...	...	@@ -54,6 +54,8 @@ class Person < Profile
54	54
55	55	has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
56	56
	57	+ has_many :creations, :class_name => 'Article', :foreign_key => :author_id
	58	+
57	59	named_scope :more_popular,
58	60	:select => "#{Profile.qualified_column_names}, count(friend_id) as total",
59	61	:group => Profile.qualified_column_names,
...	...
...	...	@@ -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>
...	...
...	...	@@ -34,11 +34,11 @@
34	34	<%= expirable_button @page, :locale, content, url %>
35	35	<% end %>
36	36
37		- <%= 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)))) %>
	37	+ <%= 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) %>
38	38	<% end %>
39	39
40	40	<% if @page.accept_uploads? && @page.allow_create?(user) %>
41		- <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
	41	+ <%= 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)%>
42	42	<% end %>
43	43
44	44	<% if !@page.allow_create?(user) && profile.community? && (@page.blog? \|\| @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
...	...
...	...	@@ -0,0 +1,11 @@
	1	+class AddAuthorIdToArticle < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :articles, :author_id, :integer
	4	+ add_column :article_versions, :author_id, :integer
	5	+ end
	6	+
	7	+ def self.down
	8	+ remove_column :articles, :author_id
	9	+ remove_column :article_versions, :author_id, :integer
	10	+ end
	11	+end
...	...