Allowing admin to edit articles before approve it

* When approving a task, some fields from published article are displayed and can be edited * Removed PublishedArticle * Added migrate to copy body, article and type from PublishedArticle's reference_article to article (ActionItem1733)

Allowing admin to edit articles before approve it
* When approving a task, some fields from published article are displayed and can be edited * Removed PublishedArticle * Added migrate to copy body, article and type from PublishedArticle's reference_article to article (ActionItem1733)
Daniela Feitosa · Antonio Terceiro
1 parent bc0cbc25
Showing 24 changed files with 439 additions and 402 deletions Show diff stats
app/models/approve_article.rb
app/models/article.rb
app/models/folder.rb
app/models/published_article.rb
app/views/content_viewer/slideshow.rhtml
app/views/tasks/_approve_article.rhtml
app/views/tasks/_article.rhtml
app/views/tasks/_textile_article.rhtml
app/views/tasks/_tiny_mce_article.rhtml
app/views/tasks/_uploaded_file.rhtml
db/migrate/20101202205446_remove_published_articles.rb
db/schema.rb
features/approve_article.feature
features/step_definitions/noosfero_steps.rb
public/javascripts/article.js
public/stylesheets/application.css
test/functional/cms_controller_test.rb
test/functional/tasks_controller_test.rb
test/unit/approve_article_test.rb
test/unit/article_test.rb
@@ -24,7 +24,7 @@ class ApproveArticle &lt; Task
   end
  
   def name
-    data[:name]
+    data[:name].blank? ? article.name : data[:name]
   end
  
   def name= value
@@ -63,12 +63,24 @@ class ApproveArticle &lt; Task
     data[:highlighted]
   end
  
+  def abstract= value
+    data[:abstract] = value
+  end
+
+  def abstract
+    data[:abstract].blank? ? article.abstract : data[:abstract]
+  end
+
+  def body= value
+    data[:body] = value
+  end
+
+  def body
+    data[:body].blank? ? article.body : data[:body]
+  end
+
   def perform
-    if article.event?
-      article.copy(:name => name, :profile => target, :reference_article => article)
-    else
-      PublishedArticle.create!(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
-    end
+     article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
   end
  
   def target_notification_message
@@ -30,6 +30,12 @@ class Article &lt; ActiveRecord::Base
  
   before_create do |article|
     article.published_at = article.created_at if article.published_at.nil?
+    if article.reference_article && !article.parent
+      parent = article.reference_article.parent
+      if parent && parent.blog? && article.profile.has_blog?
+        article.parent = article.profile.blog
+      end
+    end
   end
  
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
@@ -318,6 +324,12 @@ class Article &lt; ActiveRecord::Base
     self.class.create(attrs)
   end
  
+  def copy!(options = {})
+    attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
+    attrs.merge!(options)
+    self.class.create!(attrs)
+  end
+
   ATTRIBUTES_NOT_COPIED = [
     :id,
     :profile_id,
@@ -364,8 +376,11 @@ class Article &lt; ActiveRecord::Base
   end
  
   def author
-    last_changed_by ||
-      profile
+    if reference_article
+      reference_article.author
+    else
+      last_changed_by || profile
+    end
   end
  
   alias :active_record_cache_key :cache_key
@@ -46,7 +46,5 @@ class Folder &lt; Article
   has_many :images, :class_name => 'Article',
                     :foreign_key => 'parent_id',
                     :order => 'articles.type, articles.name',
-                    :include => :reference_article,
-                    :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery') or (articles.type = 'PublishedArticle' and reference_articles_articles.type = 'UploadedFile' and reference_articles_articles.content_type in (?))", UploadedFile.content_types, UploadedFile.content_types]
-
+                    :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types]
 end
@@ -1,44 +0,0 @@
-class PublishedArticle < Article
-  before_create do |article|
-    unless article.parent
-      parent = article.reference_article.parent
-      if parent && parent.blog? && article.profile.has_blog?
-        article.parent = article.profile.blog
-      end
-    end
-  end
-
-  def self.short_description
-    _('Reference to other article')
-  end
-
-  def self.description
-    _('A reference to another article published in another profile')    
-  end
-
-  before_validation_on_create :update_name
-  def update_name
-    self.name = self.reference_article.name if self.name.blank?
-  end
-
-  def author
-    if reference_article
-      reference_article.author
-    else
-      profile
-    end
-  end
-
-  def to_html(options={})
-    reference_article ? reference_article.to_html : ('<em>' + _('The original text was removed.') + '</em>')
-  end
-
-  def abstract
-    reference_article && reference_article.abstract
-  end
-
-  def notifiable?
-    true
-  end
-
-end
 <p class='back-button' ><%= button('', _('Back to gallery'), @page.url)%></p>
 <ul id='slideshow' >
   <% @images.each do |img| -%>
-    <% img = img.reference_article if img.kind_of?(PublishedArticle) -%>
     <% if img.image? -%>
       <li><%= image_tag(url_for(img.public_filename(:display)), :title => (img.abstract.blank? ? img.name : img.abstract)) %></li>
     <% end -%>
@@ -27,7 +27,8 @@
  
       <%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>
       <%= labelled_form_field( _('Highlight this article'), f.check_box(:highlighted)) %>
-      <%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %>
+      <%= labelled_form_field _('Comment for author'), f.text_field(:closing_statment, :style => 'width:80%;') %>
+      <%= render :partial => partial_for_class(task.article.class), :locals => { :f => f } %>
  
     </div>
   <% end %>
@@ -0,0 +1,14 @@
+<% button_bar do %>
+  <%= button :add, _("Lead"), '#', :id => "lead-button", :title => _('Used when a short version of your text is needed.'), :style => "margin-left: 0px;" %>
+  <%= button :add, _("Text"), '#', :id => "body-button", :style => "margin-left: 0px;" %>
+<% end %>
+
+<div id="article-lead">
+  <%= labelled_form_field(_('Lead'), f.text_area(:abstract, :cols => 64, :rows => 10)) %>
+</div>
+<div id="article-body-field" style="margin-top: 10px;">
+  <%= labelled_form_field(_('Text'), f.text_area(:body, :cols => 64)) %>
+</div>
+
+<%= javascript_include_tag 'article'%>
+
@@ -0,0 +1,15 @@
+<%= render :file => 'shared/tiny_mce' %>
+
+<% button_bar do %>
+  <%= button :add, _("Lead"), '#', :id => "lead-button", :title => _('Used when a short version your text is needed.'), :style => "margin-left: 0px;" %>
+  <%= button :add, _("Text"), '#', :id => "body-button", :style => "margin-left: 0px;" %>
+<% end %>
+
+<div id="article-lead">
+  <%= labelled_form_field(_('Lead'), f.text_area(:abstract, :style => 'width: 100%; height: 300px;')) %>
+</div>
+<div id="article-body-field" style="margin-top: 10px;">
+  <%= labelled_form_field(_('Text'), f.text_area(:body, :style => 'width:100%')) %>
+</div>
+
+<%= javascript_include_tag 'article' %>
@@ -0,0 +1,9 @@
+<% button_bar do %>
+  <%= button :add, _("Description"), '#', :id => "lead-button", :title => _('Used when a short version your text is needed.') %>
+<% end %>
+
+<div id="article-lead">
+  <%= labelled_form_field(_('Description'), text_area(:article, :abstract, :rows => 3, :cols => 64)) %>
+</div>
+
+<%= javascript_include_tag 'article' %>
@@ -0,0 +1,16 @@
+class RemovePublishedArticles < ActiveRecord::Migration
+  def self.up
+    select_all("SELECT * from articles WHERE type = 'PublishedArticle'").each do |published|
+      reference = Article.exists?(published['reference_article_id']) ? Article.find(published['reference_article_id']) : nil
+      if reference
+        execute("UPDATE articles SET type = '#{reference.type}', abstract = '#{reference.abstract}', body = '#{reference.body}' WHERE articles.id  = #{published['id']}")
+      else
+        execute("DELETE from articles where articles.id  = #{published['id']}")
+      end
+    end
+  end
+
+  def self.down
+    say 'Nothing to do'
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20100928000952) do
+ActiveRecord::Schema.define(:version => 20101202205446) do
  
   create_table "action_tracker", :force => true do |t|
     t.integer  "user_id"
@@ -0,0 +1,34 @@
+Feature: approve article
+  As a community admin
+  I want to approve an article
+  In order to share it with other users
+
+  Background:
+    Given the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+      | mariasilva | Maria Silva |
+    And the following articles
+      | owner | name | body | homepage |
+      | mariasilva | Sample Article | This is an article | true |
+    And the following communities
+      | identifier | name |
+      | sample-community | Sample Community |
+    And the articles of "Sample Community" are moderated
+    And "Maria Silva" is a member of "Sample Community"
+    And "Joao Silva" is admin of "Sample Community"
+
+  Scenario: edit an article before approval
+    Given I am logged in as "mariasilva"
+    And I am on Maria Silva's homepage
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Spread this"
+    When I am logged in as "joaosilva"
+    And I go to Sample Community's control panel
+    And I follow "Process requests"
+    And I fill in "Text" with "This is an article edited"
+    And I press "Ok!"
+    And I go to Sample Community's sitemap
+    When I follow "Sample Article"
+    Then I should see "This is an article edited"
@@ -301,3 +301,9 @@ Given /^the profile &quot;(.+)&quot; has no blocks$/ do |profile|
     box.blocks.destroy_all
   end
 end
+
+Given /^the articles of "(.+)" are moderated$/ do |organization|
+  organization = Organization.find_by_name(organization)
+  organization.moderated_articles = true
+  organization.save
+end
@@ -4,4 +4,9 @@
     $('#article-lead').slideToggle();
     return false;
   })
+  $("#body-button").click(function(){
+    $(this).toggleClass('icon-add').toggleClass('icon-remove');
+    $('#article-body-field').slideToggle();
+    return false;
+  })
 })(jQuery)
@@ -983,7 +983,8 @@ code input {
   font-weight: normal;
 }
  
-#article-lead {
+#article-lead,
+#article-body-field {
   margin-top: 10px;
   display: none;
 }
@@ -677,10 +677,10 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   should 'publish the article in the selected community if community is not moderated' do
     c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => false)
     c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
-    a = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
+    article = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
  
-    assert_difference PublishedArticle, :count do
-      post :publish, :profile => profile.identifier, :id => a.id, :marked_groups => {c.id.to_s => {:name => 'bli', :group_id => c.id.to_s}}
+    assert_difference article.class, :count do
+      post :publish, :profile => profile.identifier, :id => article.id, :marked_groups => {c.id.to_s => {:name => 'bli', :group_id => c.id.to_s}}
       assert_equal [{'group' => c, 'name' => 'bli'}], assigns(:marked_groups)
     end
   end
@@ -710,7 +710,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     Environment.any_instance.stubs(:portal_community).returns(portal_community)
     article = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
  
-    assert_difference PublishedArticle, :count do
+    assert_difference article.class, :count do
       post :publish_on_portal_community, :profile => profile.identifier, :id => article.id, :name => article.name
     end
   end
@@ -720,7 +720,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
     a = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
  
-    assert_no_difference PublishedArticle, :count do
+    assert_no_difference a.class, :count do
       assert_difference ApproveArticle, :count do
         assert_difference c.tasks, :count do
           post :publish, :profile => profile.identifier, :id => a.id, :marked_groups => {c.id.to_s => {:name => 'bli', :group_id => c.id.to_s}}
@@ -737,7 +737,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     Environment.any_instance.stubs(:portal_community).returns(portal_community)
     article = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
  
-    assert_no_difference PublishedArticle, :count do
+    assert_no_difference article.class, :count do
       assert_difference ApproveArticle, :count do
         assert_difference portal_community.tasks, :count do
           post :publish_on_portal_community, :profile => profile.identifier, :id => article.id, :name => article.name
@@ -153,8 +153,7 @@ class TasksControllerTest &lt; Test::Unit::TestCase
      assert_equal f, assigns(:ticket).target
   end
  
-  should 'create published article after finish approve article task' do
-    PublishedArticle.destroy_all
+  should 'create article with reference_article after finish approve article task' do
     c = fast_create(Community)
     c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
@@ -162,12 +161,11 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
     t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
  
-    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new_name'}
-    assert_equal article, PublishedArticle.find(:first).reference_article
+    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new name'}
+    assert_equal article, c.articles.find_by_name('new name').reference_article
   end
  
   should 'create published article in folder after finish approve article task' do
-    PublishedArticle.destroy_all
     c = fast_create(Community)
     c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
@@ -176,35 +174,33 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
     t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
  
-    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new_name', :article_parent_id => folder.id}
-    assert_equal folder, PublishedArticle.find(:first).parent
+    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new name', :article_parent_id => folder.id}
+    assert_equal folder, c.articles.find_by_name('new name').parent
   end
  
   should 'be highlighted if asked when approving a published article' do
-    PublishedArticle.destroy_all
     c = fast_create(Community)
     c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
     folder = c.articles.create!(:name => 'test folder', :type => 'Folder')
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
-    t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
+    t = ApproveArticle.create!(:article => article, :target => c, :requestor => profile)
  
-    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new_name', :article_parent_id => folder.id, :highlighted => true}
-    assert_equal true, PublishedArticle.find(:first).highlighted
+    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new name', :article_parent_id => folder.id, :highlighted => true}
+    assert_equal true, c.articles.find_by_name('new name').highlighted
   end
  
-  should 'create published article after choosing root folder on approve article task' do
-    PublishedArticle.destroy_all
+  should 'create article of same class after choosing root folder on approve article task' do
     c = fast_create(Community)
     c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
     c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
     article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
-    t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
+    t = ApproveArticle.create!(:article => article, :target => c, :requestor => profile)
  
-    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new_name', :article_parent_id => ""}
-    assert_not_nil PublishedArticle.find(:first)
+    post :close, :decision => 'finish', :id => t.id, :task => { :name => 'new name', :article_parent_id => ""}
+    assert_equal article.class, c.articles.find_by_name('new name').class
   end
  
   should 'handle blank names for published articles' do
@@ -220,10 +216,10 @@ class TasksControllerTest &lt; Test::Unit::TestCase
     a = ApproveArticle.create!(:article => article, :target => c, :requestor => person)
     assert_includes c.tasks, a
  
-    assert_difference PublishedArticle, :count do
+    assert_difference article.class, :count do
         post :close, {"commit"=>"Ok!", "id"=> a.id.to_s, "task"=>{"name"=>"", "closing_statment"=>"", "highlighted"=>"0", "article_parent_id"=>c_blog2.id.to_s}, "decision"=>"finish"}
     end
-    assert p_article = PublishedArticle.find_by_reference_article_id(article.id)
+    assert p_article = article.class.find_by_reference_article_id(article.id)
     assert_includes c_blog2.children(true), p_article
   end
  
@@ -7,24 +7,28 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
     @profile = create_user('test_user').person
+    @article = fast_create(TextileArticle, :profile_id => @profile.id, :name => 'test name', :abstract => 'Lead of article', :body => 'This is my article')
+    @community = fast_create(Community)
   end
-  attr_reader :profile
+  attr_reader :profile, :article, :community
  
   should 'have name, reference article and profile' do
-    article = fast_create(TextArticle, :profile_id => profile.id, :name => 'test article')
-
-    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile)
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
  
-    assert_equal 'test name', a.name
     assert_equal article, a.article
-    assert_equal profile, a.target
+    assert_equal community, a.target
   end
  
-  should 'create published article when finished' do
-    article = fast_create(TextArticle, :profile_id => profile.id, :name => 'test article')
-    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile)
+  should 'have abstract and body' do
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
+
+    assert_equal ['Lead of article', 'This is my article'], [a.abstract, a.body]
+  end
+
+  should 'create an article with the same class as original when finished' do
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
  
-    assert_difference PublishedArticle, :count do
+    assert_difference article.class, :count do
       a.finish
     end
   end
@@ -39,7 +43,6 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
   end
  
   should 'have parent if defined' do
-    article = fast_create(TextArticle, :profile_id => profile.id, :name => 'test article')
     folder = profile.articles.create!(:name => 'test folder', :type => 'Folder')
  
     a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile, :article_parent_id => folder.id)
@@ -48,16 +51,12 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
   end
  
   should 'not have parent if not defined' do
-    article = fast_create(TextArticle, :profile_id => profile.id, :name => 'test article')
-
     a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile)
  
     assert_nil a.article_parent
   end
  
   should 'alert when reference article is removed' do
-    article = profile.articles.create!(:name => 'test article')
-
     a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile)
  
     article.destroy
@@ -67,44 +66,269 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
   end
  
   should 'preserve article_parent' do
-    article = profile.articles.create!(:name => 'test article')
     a = ApproveArticle.new(:article_parent => article)
  
     assert_equal article, a.article_parent
   end
  
   should 'handle blank names' do
-    article = profile.articles.create!(:name => 'test article')
-    community = fast_create(Community, :name => 'test comm')
     a = ApproveArticle.create!(:name => '', :article => article, :target => community, :requestor => profile)
  
-    assert_difference PublishedArticle, :count do
+    assert_difference article.class, :count do
       a.finish
     end
   end
  
   should 'notify target if group is moderated' do
-    article = fast_create(TextArticle, :profile_id => profile.id, :name => 'test article')
-    community = Community.create!(:name => 'test comm', :moderated_articles => true)
+    community.moderated_articles = true
+    community.save
+
     a = ApproveArticle.create!(:name => '', :article => article, :target => community, :requestor => profile)
     assert !ActionMailer::Base.deliveries.empty?
   end
  
   should 'not notify target if group is not moderated' do
-    article = fast_create(TextArticle, :profile_id => profile.id, :name => 'test article')
-    community = Community.create!(:name => 'test comm', :moderated_articles => false)
+    community.moderated_articles = false
+    community.save
+
     a = ApproveArticle.create!(:name => '', :article => article, :target => community, :requestor => profile)
     assert ActionMailer::Base.deliveries.empty?
   end
  
   should 'copy the source from the original article' do
-    article = fast_create(TextArticle, :profile_id => profile.id, :name => 'test article', :source => "sample-feed.com")
-    community = fast_create(Community, :name => 'test comm')
+    article.source = 'sample-feed.com'
+    article.save
+
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert_equal article.class.last.source, article.source
+  end
+
+  should 'have a reference article and profile on published article' do
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
+    a.finish
+
+    published = article.class.last
+    assert_equal [article, community], [published.reference_article, published.profile]
+  end
+
+  should 'copy name from original article' do
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
  
+    assert_equal 'test name', article.class.last.name
+  end
+
+  should 'be able to edit name of generated article' do
+    a = ApproveArticle.create!(:name => 'Other name', :article => article, :target => community, :requestor => profile)
+    a.abstract = 'Abstract edited';a.save
+    a.finish
+
+    assert_equal 'Other name', article.class.last.name
+  end
+
+  should 'copy abstract from original article' do
     a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
     a.finish
  
-    assert_equal PublishedArticle.last.source, article.source
+    assert_equal 'Lead of article', article.class.last.abstract
   end
  
+  should 'be able to edit abstract of generated article' do
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
+    a.abstract = 'Abstract edited';a.save
+    a.finish
+
+    assert_equal 'Abstract edited', article.class.last.abstract
+  end
+
+  should 'copy body from original article' do
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert_equal 'This is my article', article.class.last.body
+  end
+
+  should 'be able to edit body of generated article' do
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => community, :requestor => profile)
+    a.body = 'Body edited';a.save
+    a.finish
+
+    assert_equal 'Body edited', article.class.last.body
+  end
+
+  should 'not be created in blog if community does not have a blog' do
+    profile_blog = fast_create(Blog, :profile_id => profile.id)
+    article.parent = profile_blog
+    article.save
+
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert !community.has_blog?
+    assert_nil article.class.last.parent
+  end
+
+  should 'be created in community blog if came from a blog' do
+    profile_blog = fast_create(Blog, :profile_id => profile.id)
+    article.parent = profile_blog
+    article.save
+
+    community.articles << Blog.new(:profile => community)
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert_equal community.blog, article.class.last.parent
+  end
+
+  should 'not be created in community blog if did not come from a blog' do
+    profile_folder = fast_create(Folder, :profile_id => profile.id)
+    article.parent = profile_folder
+    article.save
+
+    blog = fast_create(Blog, :profile_id => community.id)
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert_nil article.class.last.parent
+  end
+
+  should 'overwrite blog if parent was choosen on published' do
+    profile_blog = fast_create(Blog, :profile_id => profile.id)
+    article.parent = profile_blog
+    article.save
+
+    community.articles << Blog.new(:profile => community)
+    community_folder = fast_create(Folder, :profile_id => profile.id)
+
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile, :article_parent => community_folder)
+    a.finish
+
+    assert_equal community_folder, article.class.last.parent
+  end
+
+  should 'use author from original article on published' do
+    article.stubs(:last_changed_by_id).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
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    article.destroy
+
+    assert_equal community, article.class.last.author
+  end
+
+  should 'the published article have parent if defined' do
+    folder = fast_create(Folder, :profile_id => community.id)
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile, :article_parent => folder)
+    a.finish
+
+    assert_equal folder, article.class.last.parent
+  end
+
+  should 'copy to_html from reference_article' do
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert_equal article.to_html, article.class.last.to_html
+  end
+
+  should 'notify activity on creating published' do
+    ActionTracker::Record.delete_all
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert_equal 1, ActionTracker::Record.count
+  end
+
+  should 'notify with different trackers activity create with different targets' do
+    ActionTracker::Record.delete_all
+
+    article = fast_create(TextileArticle)
+    a = ApproveArticle.create!(:name => 'bar', :article => article, :target => community, :requestor => profile)
+    a.finish
+
+    article = fast_create(TextileArticle)
+    a = ApproveArticle.create!(:name => 'another bar', :article => article, :target => community, :requestor => profile)
+    a.finish
+    assert_equal 1, ActionTracker::Record.count
+
+    article = fast_create(TextileArticle)
+    other_community = fast_create(Community)
+    a = ApproveArticle.create!(:name => 'another bar', :article => article, :target => other_community, :requestor => profile)
+    a.finish
+    assert_equal 2, ActionTracker::Record.count
+  end
+
+  should 'notify activity on update' do
+    ActionTracker::Record.delete_all
+    a = ApproveArticle.create!(:name => 'bar', :article => article, :target => community, :requestor => profile)
+    a.finish
+    assert_equal 1, ActionTracker::Record.count
+
+    published = article.class.last
+    published.name = 'foo'
+    published.save!
+    assert_equal 2, ActionTracker::Record.count
+  end
+
+  should 'notify with different trackers activity update with different targets' do
+    ActionTracker::Record.delete_all
+    article1 = fast_create(TextileArticle)
+    a = ApproveArticle.create!(:name => 'bar', :article => article1, :target => community, :requestor => profile)
+    a.finish
+
+    article2 = fast_create(TinyMceArticle)
+    other_community = fast_create(Community)
+    a = ApproveArticle.create!(:name => 'another bar', :article => article2, :target => other_community, :requestor => profile)
+    a.finish
+    assert_equal 2, ActionTracker::Record.count
+
+    published = article1.class.last
+    published.name = 'foo';published.save!
+    assert_equal 3, ActionTracker::Record.count
+
+    published = article2.class.last
+    published.name = 'another foo';published.save!
+    assert_equal 4, ActionTracker::Record.count
+  end
+
+  should "the tracker action target be defined as Community by custom_target method on articles'creation in communities" do
+    ActionTracker::Record.delete_all
+    person = fast_create(Person)
+    community.add_member(person)
+
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert_equal Community, ActionTracker::Record.last.target.class
+  end
+
+  should "the tracker action target be defined as person by custom_target method on articles'creation in profile" do
+    ActionTracker::Record.delete_all
+    person = fast_create(Person)
+
+    a = ApproveArticle.create!(:article => article, :target => person, :requestor => profile)
+    a.finish
+
+    assert_equal Person, ActionTracker::Record.last.target.class
+  end
+
+  should "have the same is_trackable method as original article" do
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    assert_equal article.is_trackable?, article.class.last.is_trackable?
+  end
+
+
 end
@@ -866,13 +866,16 @@ class ArticleTest &lt; Test::Unit::TestCase
   end
  
   should 'not doubly escape quotes in the name' do
-    profile = fast_create(Profile)
-    a = fast_create(Article, :profile_id => profile.id)
-    p = PublishedArticle.create!(:reference_article => a, :profile => fast_create(Community))
-
-    p.name = 'title with "quotes"'
-    p.save
-    assert_equal 'title with "quotes"', p.name
+    person = fast_create(Person)
+    community = fast_create(Community)
+    article = fast_create(Article, :name => 'article name', :profile_id => person.id)
+    a = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    a.finish
+
+    published = community.articles.find_by_name('article name')
+    published.name = 'title with "quotes"'
+    published.save
+    assert_equal 'title with "quotes"', published.name
   end
  
   should 'remove script tags from name' do
@@ -89,14 +89,15 @@ class FolderTest &lt; ActiveSupport::TestCase
   end
  
   should 'return published images as images' do
-    p = create_user('test_user').person
-    i = UploadedFile.create!(:profile => p, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
+    person = create_user('test_user').person
+    image = UploadedFile.create!(:profile => person, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
  
-    c = fast_create(Community)
-    folder = fast_create(Folder, :profile_id => c.id)
-    pi = PublishedArticle.create!(:profile => c, :reference_article => i, :parent => folder)
+    community = fast_create(Community)
+    folder = fast_create(Folder, :profile_id => community.id)
+    a = ApproveArticle.create!(:article => image, :target => community, :requestor => person, :article_parent => folder)
+    a.finish
  
-    assert_includes folder.images(true), pi
+    assert_includes folder.images(true), community.articles.find_by_name('rails.png')
   end
  
   should 'not let pass javascript in the body' do
@@ -98,9 +98,11 @@ class GalleryTest &lt; ActiveSupport::TestCase
  
     c = fast_create(Community)
     gallery = fast_create(Gallery, :profile_id => c.id)
-    pi = PublishedArticle.create!(:profile => c, :reference_article => i, :parent => gallery)
  
-    assert_includes gallery.images(true), pi
+    a = ApproveArticle.create!(:article => i, :target => c, :requestor => p, :article_parent => gallery)
+    a.finish
+
+    assert_includes gallery.images(true), c.articles.find_by_name('rails.png')
   end
  
   should 'not let pass javascript in the body' do
@@ -1,272 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class PublishedArticleTest < ActiveSupport::TestCase
-
-  def setup
-    @profile = create_user('test_user').person
-    @article = fast_create(Article, :profile_id => @profile.id, :name => 'test_article', :body => 'some trivial body')
-  end
-  
-  should 'have a reference article and profile' do
-    prof = fast_create(Community)
-    p = PublishedArticle.create(:reference_article => @article, :profile => prof)
-
-    assert p
-    assert_equal prof, p.profile
-    assert_equal @article, p.reference_article
-  end
-
-  should 'have a different name than reference article' do
-    prof = fast_create(Community)
-    p = PublishedArticle.create(:reference_article => @article, :profile => prof, :name => 'other title')
-
-    assert_equal 'other title', p.name
-    assert_not_equal @article.name, p.name
-    
-  end
-
-  should 'use name of reference article a default name' do
-    prof = fast_create(Community)
-    p = PublishedArticle.create!(:reference_article => @article, :profile => prof)
-
-    assert_equal @article.name, p.name
-  end
-
-  should 'not be created in blog if community does not have a blog' do
-    parent = mock
-    @article.expects(:parent).returns(parent)
-    parent.expects(:blog?).returns(true)
-    prof = fast_create(Community)
-    p = PublishedArticle.create!(:reference_article => @article, :profile => prof)
-
-    assert !prof.has_blog?
-    assert_nil p.parent
-  end
-
-  should 'be created in community blog if came from a blog' do
-    parent = mock
-    @article.expects(:parent).returns(parent)
-    parent.expects(:blog?).returns(true)
-    prof = fast_create(Community)
-    prof.articles << Blog.new(:profile => prof, :name => 'Blog test')
-    p = PublishedArticle.create!(:reference_article => @article, :profile => prof)
-
-    assert_equal p.parent, prof.blog
-  end
-
-  should 'not be created in community blog if did not come from a blog' do
-    parent = mock
-    @article.expects(:parent).returns(parent)
-    parent.expects(:blog?).returns(false)
-    prof = fast_create(Community)
-    blog = fast_create(Blog, :profile_id => prof.id, :name => 'Blog test')
-    p = PublishedArticle.create!(:reference_article => @article, :profile => prof)
-
-    assert_nil p.parent
-  end
-
-  should "use author of original article as its author" do
-    original = Article.new(:last_changed_by => @profile)
-    community = Community.new
-    published = PublishedArticle.new(:reference_article => original, :profile => community)
-    assert_equal @profile, published.author
-  end
-
-  should 'use owning profile as author when there is no referenced article yet' do
-    assert_equal @profile, PublishedArticle.new(:profile => @profile).author
-  end
-
-  should 'have parent if defined' do
-    prof = fast_create(Community)
-    folder = fast_create(Folder, :name => 'folder test', :profile_id => prof.id)
-    p = PublishedArticle.create(:reference_article => @article, :profile => prof, :parent => folder)
-
-    assert p
-    assert_equal folder, p.parent
-  end
-
-  should 'use to_html from reference_article' do
-    prof = fast_create(Community)
-    p = PublishedArticle.create!(:reference_article => @article, :profile => prof)
-
-    assert_equal @article.to_html, p.to_html
-  end
-
-  should 'use to_html from reference_article when is Textile' do
-    prof = fast_create(Community)
-    textile_article = fast_create(TextileArticle, :name => 'textile_article', :body => '*my text*', :profile_id => prof.id)
-    p = PublishedArticle.create!(:reference_article => textile_article, :profile => prof)
-
-    assert_equal textile_article.to_html, p.to_html
-  end
-
-  should 'display message when reference_article does not exist' do
-    prof = fast_create(Community)
-    textile_article = fast_create(TextileArticle, :name => 'textile_article', :body => '*my text*', :profile_id => prof.id)
-    p = PublishedArticle.create!(:reference_article => textile_article, :profile => prof)
-    textile_article.destroy
-    p.reload
-
-    assert_match /removed/, p.to_html
-  end
-
-  should 'use abstract from referenced article' do
-    original = Article.new(:abstract => 'this is the abstract')
-    published = PublishedArticle.new
-    published.stubs(:reference_article).returns(original)
-
-    assert_equal 'this is the abstract', published.abstract
-  end
-
-  should 'return no abstract when reference_article does not exist' do
-    published = PublishedArticle.new
-    published.stubs(:reference_article).returns(nil)
-
-    assert_nil published.abstract
-  end
-
-  should 'specified parent overwrite blog' do
-    parent = mock
-    @article.stubs(:parent).returns(parent)
-    parent.stubs(:blog?).returns(true)
-    prof = fast_create(Community)
-    prof.articles << Blog.new(:profile => prof, :name => 'Blog test')
-    new_parent = fast_create(Folder, :profile_id => prof.id, :name => 'Folder test')
-    p = PublishedArticle.create!(:reference_article => @article, :profile => prof, :parent => new_parent)
-
-    assert_equal p.parent, new_parent
-  end
-
-  should 'notifiable be true' do
-    a = fast_create(PublishedArticle)
-    assert a.notifiable?
-  end
-
-  should 'notify activity on create' do
-    ActionTracker::Record.delete_all
-    a = fast_create(Article)
-    PublishedArticle.create! :reference_article => a, :name => 'test', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-  end
-
-  should 'notify with different trackers activity create with different targets' do
-    ActionTracker::Record.delete_all
-    profile = fast_create(Profile)
-    a = fast_create(Article)
-    PublishedArticle.create! :reference_article => a, :name => 'bar', :profile_id => profile.id, :published => true
-    a = fast_create(Article)
-    PublishedArticle.create! :reference_article => a, :name => 'another bar', :profile_id => profile.id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-    a = fast_create(Article)
-    PublishedArticle.create! :reference_article => a, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 2, ActionTracker::Record.count
-  end
-
-  should 'notify activity on update' do
-    ActionTracker::Record.delete_all
-    a = fast_create(Article)
-    a = PublishedArticle.create! :reference_article => a, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-    a.name = 'foo'
-    a.save!
-    assert_equal 2, ActionTracker::Record.count
-  end
-
-  should 'notify with different trackers activity update with different targets' do
-    ActionTracker::Record.delete_all
-    a = fast_create(Article)
-    a1 = PublishedArticle.create! :reference_article => a, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    a = fast_create(Article)
-    a2 = PublishedArticle.create! :reference_article => a, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 2, ActionTracker::Record.count
-    a1.name = 'foo'
-    a1.save!
-    assert_equal 3, ActionTracker::Record.count
-    a2.name = 'another foo'
-    a2.save!
-    assert_equal 4, ActionTracker::Record.count
-  end
-
-  should 'notify activity on destroy' do
-    ActionTracker::Record.delete_all
-    a = fast_create(Article)
-    a = PublishedArticle.create! :reference_article => a, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 1, ActionTracker::Record.count
-    a.destroy
-    assert_equal 2, ActionTracker::Record.count
-  end
-
-  should 'notify different activities when destroy articles with diferrents targets' do
-    ActionTracker::Record.delete_all
-    a = fast_create(Article)
-    a1 = PublishedArticle.create! :reference_article => a, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    a = fast_create(Article)
-    a2 = PublishedArticle.create! :reference_article => a, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_equal 2, ActionTracker::Record.count
-    a1.destroy
-    assert_equal 3, ActionTracker::Record.count
-    a2.destroy
-    assert_equal 4, ActionTracker::Record.count
-  end
-
-  should "the tracker action target be defined as Community by custom_target method on articles'creation in communities" do
-    ActionTracker::Record.delete_all
-    community = fast_create(Community)
-    p1 = Person.first
-    community.add_member(p1)
-    assert p1.is_member_of?(community)
-    a = fast_create(Article)
-    article = PublishedArticle.create! :reference_article => a, :name => 'test', :profile_id => community.id
-    assert_equal true, article.published?
-    assert_equal true, article.notifiable?
-    assert_equal false, article.image?
-    assert_equal Community, article.profile.class
-    assert_equal Community, ActionTracker::Record.last.target.class
-  end
-
-  should "the tracker action target be defined as person by custom_target method on articles'creation in profile" do
-    ActionTracker::Record.delete_all
-    person = Person.first
-    a = fast_create(Article)
-    article = PublishedArticle.create! :reference_article => a, :name => 'test', :profile_id => person.id
-    assert_equal true, article.published?
-    assert_equal true, article.notifiable?
-    assert_equal false, article.image?
-    assert_equal Person, article.profile.class
-    assert_equal person, ActionTracker::Record.last.target
-  end
-
-  should 'not notify activity if the article is not advertise' do
-    ActionTracker::Record.delete_all
-    article = fast_create(Article)
-    a = PublishedArticle.create! :reference_article => article, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true, :advertise => false
-    assert_equal true, a.published?
-    assert_equal true, a.notifiable?
-    assert_equal false, a.image?
-    assert_equal false, a.profile.is_a?(Community)
-    assert_equal 0, ActionTracker::Record.count
-  end
-
-  should "have defined the is_trackable method defined" do
-    assert PublishedArticle.method_defined?(:is_trackable?)
-  end
-
-  should "the common trackable conditions return the correct value" do
-    a =  PublishedArticle.new
-    a.published = a.advertise = true
-    assert_equal true, a.published?
-    assert_equal true, a.notifiable?
-    assert_equal true, a.advertise?
-    assert_equal true, a.is_trackable?
-   
-    a.published=false
-    assert_equal false, a.published?
-    assert_equal false, a.is_trackable?
-
-    a.published=true
-    a.advertise=false
-    assert_equal false, a.advertise?
-    assert_equal false, a.is_trackable?
-  end
-
-end
@@ -123,7 +123,7 @@ class RssFeedTest &lt; Test::Unit::TestCase
     feed.profile = profile
     feed.save!
  
-    assert_match "<link>http://colivre.net/testuser</link>", feed.data
+    assert_match "<link>http://#{profile.environment.default_hostname}/testuser</link>", feed.data
   end
  
   should 'provide link to each article' do
@@ -205,15 +205,17 @@ class RssFeedTest &lt; Test::Unit::TestCase
     assert_equal false, a.can_display_hits?
   end
  
-  should 'display the referenced body of a PublishedArticle' do
-    article = fast_create(Article, :body => 'This is the content of the Sample Article.')
+  should 'display the referenced body of a article published' do
+    article = fast_create(TextileArticle, :body => 'This is the content of the Sample Article.')
     profile = fast_create(Profile)
     blog = fast_create(Blog, :profile_id => profile.id)
-    published_article = PublishedArticle.create!(:reference_article => article, :profile => profile)
-    blog.posts << published_article
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => fast_create(Person))
+    a.finish
+
+    blog.posts << published_article = article.class.last
     feed = RssFeed.new(:parent => blog, :profile => profile)
  
-    assert_match published_article.to_html, feed.data
+    assert_match "This is the content of the Sample Article", feed.data
   end
  
   should 'display articles even within a private profile' do
...	...	@@ -24,7 +24,7 @@ class ApproveArticle < Task
24	24	end
25	25
26	26	def name
27		- data[:name]
	27	+ data[:name].blank? ? article.name : data[:name]
28	28	end
29	29
30	30	def name= value
...	...	@@ -63,12 +63,24 @@ class ApproveArticle < Task
63	63	data[:highlighted]
64	64	end
65	65
	66	+ def abstract= value
	67	+ data[:abstract] = value
	68	+ end
	69	+
	70	+ def abstract
	71	+ data[:abstract].blank? ? article.abstract : data[:abstract]
	72	+ end
	73	+
	74	+ def body= value
	75	+ data[:body] = value
	76	+ end
	77	+
	78	+ def body
	79	+ data[:body].blank? ? article.body : data[:body]
	80	+ end
	81	+
66	82	def perform
67		- if article.event?
68		- article.copy(:name => name, :profile => target, :reference_article => article)
69		- else
70		- PublishedArticle.create!(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
71		- end
	83	+ article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
72	84	end
73	85
74	86	def target_notification_message
...	...
...	...	@@ -30,6 +30,12 @@ class Article < ActiveRecord::Base
30	30
31	31	before_create do \|article\|
32	32	article.published_at = article.created_at if article.published_at.nil?
	33	+ if article.reference_article && !article.parent
	34	+ parent = article.reference_article.parent
	35	+ if parent && parent.blog? && article.profile.has_blog?
	36	+ article.parent = article.profile.blog
	37	+ end
	38	+ end
33	39	end
34	40
35	41	xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
...	...	@@ -318,6 +324,12 @@ class Article < ActiveRecord::Base
318	324	self.class.create(attrs)
319	325	end
320	326
	327	+ def copy!(options = {})
	328	+ attrs = attributes.reject! { \|key, value\| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
	329	+ attrs.merge!(options)
	330	+ self.class.create!(attrs)
	331	+ end
	332	+
321	333	ATTRIBUTES_NOT_COPIED = [
322	334	:id,
323	335	:profile_id,
...	...	@@ -364,8 +376,11 @@ class Article < ActiveRecord::Base
364	376	end
365	377
366	378	def author
367		- last_changed_by \|\|
368		- profile
	379	+ if reference_article
	380	+ reference_article.author
	381	+ else
	382	+ last_changed_by \|\| profile
	383	+ end
369	384	end
370	385
371	386	alias :active_record_cache_key :cache_key
...	...
...	...	@@ -46,7 +46,5 @@ class Folder < Article
46	46	has_many :images, :class_name => 'Article',
47	47	:foreign_key => 'parent_id',
48	48	:order => 'articles.type, articles.name',
49		- :include => :reference_article,
50		- :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery') or (articles.type = 'PublishedArticle' and reference_articles_articles.type = 'UploadedFile' and reference_articles_articles.content_type in (?))", UploadedFile.content_types, UploadedFile.content_types]
51		-
	49	+ :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types]
52	50	end
...	...
...	...	@@ -1,44 +0,0 @@
1		-class PublishedArticle < Article
2		- before_create do \|article\|
3		- unless article.parent
4		- parent = article.reference_article.parent
5		- if parent && parent.blog? && article.profile.has_blog?
6		- article.parent = article.profile.blog
7		- end
8		- end
9		- end
10		-
11		- def self.short_description
12		- _('Reference to other article')
13		- end
14		-
15		- def self.description
16		- _('A reference to another article published in another profile')
17		- end
18		-
19		- before_validation_on_create :update_name
20		- def update_name
21		- self.name = self.reference_article.name if self.name.blank?
22		- end
23		-
24		- def author
25		- if reference_article
26		- reference_article.author
27		- else
28		- profile
29		- end
30		- end
31		-
32		- def to_html(options={})
33		- reference_article ? reference_article.to_html : ('<em>' + _('The original text was removed.') + '</em>')
34		- end
35		-
36		- def abstract
37		- reference_article && reference_article.abstract
38		- end
39		-
40		- def notifiable?
41		- true
42		- end
43		-
44		-end
1	1	<p class='back-button' ><%= button('', _('Back to gallery'), @page.url)%></p>
2	2	<ul id='slideshow' >
3	3	<% @images.each do \|img\| -%>
4		- <% img = img.reference_article if img.kind_of?(PublishedArticle) -%>
5	4	<% if img.image? -%>
6	5	<li><%= image_tag(url_for(img.public_filename(:display)), :title => (img.abstract.blank? ? img.name : img.abstract)) %></li>
7	6	<% end -%>
...	...
...	...	@@ -27,7 +27,8 @@
27	27
28	28	<%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>
29	29	<%= labelled_form_field( _('Highlight this article'), f.check_box(:highlighted)) %>
30		- <%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %>
	30	+ <%= labelled_form_field _('Comment for author'), f.text_field(:closing_statment, :style => 'width:80%;') %>
	31	+ <%= render :partial => partial_for_class(task.article.class), :locals => { :f => f } %>
31	32
32	33	</div>
33	34	<% end %>
...	...
...	...	@@ -0,0 +1,14 @@
	1	+<% button_bar do %>
	2	+ <%= button :add, _("Lead"), '#', :id => "lead-button", :title => _('Used when a short version of your text is needed.'), :style => "margin-left: 0px;" %>
	3	+ <%= button :add, _("Text"), '#', :id => "body-button", :style => "margin-left: 0px;" %>
	4	+<% end %>
	5	+
	6	+<div id="article-lead">
	7	+ <%= labelled_form_field(_('Lead'), f.text_area(:abstract, :cols => 64, :rows => 10)) %>
	8	+</div>
	9	+<div id="article-body-field" style="margin-top: 10px;">
	10	+ <%= labelled_form_field(_('Text'), f.text_area(:body, :cols => 64)) %>
	11	+</div>
	12	+
	13	+<%= javascript_include_tag 'article'%>
	14	+
...	...
...	...	@@ -0,0 +1,15 @@
	1	+<%= render :file => 'shared/tiny_mce' %>
	2	+
	3	+<% button_bar do %>
	4	+ <%= button :add, _("Lead"), '#', :id => "lead-button", :title => _('Used when a short version your text is needed.'), :style => "margin-left: 0px;" %>
	5	+ <%= button :add, _("Text"), '#', :id => "body-button", :style => "margin-left: 0px;" %>
	6	+<% end %>
	7	+
	8	+<div id="article-lead">
	9	+ <%= labelled_form_field(_('Lead'), f.text_area(:abstract, :style => 'width: 100%; height: 300px;')) %>
	10	+</div>
	11	+<div id="article-body-field" style="margin-top: 10px;">
	12	+ <%= labelled_form_field(_('Text'), f.text_area(:body, :style => 'width:100%')) %>
	13	+</div>
	14	+
	15	+<%= javascript_include_tag 'article' %>
...	...
...	...	@@ -0,0 +1,9 @@
	1	+<% button_bar do %>
	2	+ <%= button :add, _("Description"), '#', :id => "lead-button", :title => _('Used when a short version your text is needed.') %>
	3	+<% end %>
	4	+
	5	+<div id="article-lead">
	6	+ <%= labelled_form_field(_('Description'), text_area(:article, :abstract, :rows => 3, :cols => 64)) %>
	7	+</div>
	8	+
	9	+<%= javascript_include_tag 'article' %>
...	...
...	...	@@ -0,0 +1,16 @@
	1	+class RemovePublishedArticles < ActiveRecord::Migration
	2	+ def self.up
	3	+ select_all("SELECT * from articles WHERE type = 'PublishedArticle'").each do \|published\|
	4	+ reference = Article.exists?(published['reference_article_id']) ? Article.find(published['reference_article_id']) : nil
	5	+ if reference
	6	+ execute("UPDATE articles SET type = '#{reference.type}', abstract = '#{reference.abstract}', body = '#{reference.body}' WHERE articles.id = #{published['id']}")
	7	+ else
	8	+ execute("DELETE from articles where articles.id = #{published['id']}")
	9	+ end
	10	+ end
	11	+ end
	12	+
	13	+ def self.down
	14	+ say 'Nothing to do'
	15	+ end
	16	+end
...	...