Fixes for merge request 579

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Fixes for merge request 579
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Fabio Teixeira
1 parent d7eeb588
Showing 6 changed files with 38 additions and 36 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/application_helper.rb
app/models/article.rb
plugins/tolerance_time/lib/tolerance_time_plugin.rb
test/functional/content_viewer_controller_test.rb
test/unit/application_helper_test.rb
@@ -145,12 +145,12 @@ class CmsController &lt; MyProfileController
     article_data.merge!(params[:article]) if params[:article]
     article_data.merge!(:profile => profile) if profile
-    if params[:clone]
-      current_article = profile.articles.find(params[:id])
-      @article = current_article.dup
-    else
-      @article = klass.new(article_data)
-    end
+    @article = if params[:clone]
+                current_article = profile.articles.find(params[:id])
+                current_article.copy_without_save
+              else
+                klass.new(article_data)
+              end
     parent = check_parent(params[:parent_id])
     if parent
@@ -932,23 +932,15 @@ module ApplicationHelper
   end
   def label_for_clone_article(article)
-    klass = class_to_s(article.class)
-    _("Clone #{klass}")
-  end
+    valid_type_names = ["Folder", "Blog", "Event", "Forum"]
-  def class_to_s(article_type)
-    classes = {
-      Folder => _("folder"),
-      Blog => _("blog"),
-      Event => _("event"),
-      Forum => _("forum"),
-    }
+    article_type = if valid_type_names.include?(article.class.to_s)
+                      article.class.to_s
+                   else
+                      "Article"
+                   end
-    if classes.has_key?(article_type)
-      classes[article_type]
-    else
-      _("article")
-    end
+    _('Clone %s') % article_type
   end
   def add_rss_feed_to_head(title, url)
@@ -577,25 +577,24 @@ class Article &lt; ActiveRecord::Base
     profile.visible? && profile.public? && published?
   end
-
-  def copy(options = {})
+  def copy_without_save(options = {})
     attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
     attrs.merge!(options)
     object = self.class.new
     attrs.each do |key, value|
       object.send(key.to_s+'=', value)
     end
+    object
+  end
+
+  def copy(options = {})
+    object = copy_without_save(options)
     object.save
     object
   end
   def copy!(options = {})
-    attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
-    attrs.merge!(options)
-    object = self.class.new
-    attrs.each do |key, value|
-      object.send(key.to_s+'=', value)
-    end
+    object = copy_without_save(options)
     object.save!
     object
   end
@@ -56,9 +56,18 @@ class ToleranceTimePlugin &lt; Noosfero::Plugin
   end
   def content_expire_edit(content)
+    content_expire_for(content, "editing")
+  end
+
+  def content_expire_clone(content)
+    content_expire_for(content, "cloning")
+  end
+
+  private
+
+  def content_expire_for(content, action)
     if ToleranceTimePlugin.expired?(content)
-      _('The tolerance time for editing this content is over.')
+      _('The tolerance time for %s this content is over.') % action
     end
   end
-
 end
@@ -1252,9 +1252,11 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'expire article actions button if any plugins says so' do
     class Plugin1 < Noosfero::Plugin
       def content_expire_edit(content); 'This button is expired.'; end
+      def content_expire_clone(content); 'This button is expired.'; end
     end
     class Plugin2 < Noosfero::Plugin
       def content_expire_edit(content); nil; end
+      def content_expire_clone(content); nil; end
     end
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
@@ -1010,11 +1010,11 @@ class ApplicationHelperTest &lt; ActionView::TestCase
   end
   should "return the related class string" do
-    assert_equal "Clone folder", label_for_clone_article(Folder.new)
-    assert_equal "Clone blog", label_for_clone_article(Blog.new)
-    assert_equal "Clone event", label_for_clone_article(Event.new)
-    assert_equal "Clone forum", label_for_clone_article(Forum.new)
-    assert_equal "Clone article", label_for_clone_article(TinyMceArticle.new)
+    assert_equal "Clone Folder", label_for_clone_article(Folder.new)
+    assert_equal "Clone Blog", label_for_clone_article(Blog.new)
+    assert_equal "Clone Event", label_for_clone_article(Event.new)
+    assert_equal "Clone Forum", label_for_clone_article(Forum.new)
+    assert_equal "Clone Article", label_for_clone_article(TinyMceArticle.new)
   end
   protected
	@@ -56,9 +56,18 @@ class ToleranceTimePlugin < Noosfero::Plugin		@@ -56,9 +56,18 @@ class ToleranceTimePlugin < Noosfero::Plugin
56	end	56	end
57		57
58	def content_expire_edit(content)	58	def content_expire_edit(content)
		59	+ content_expire_for(content, "editing")
		60	+ end
		61	+
		62	+ def content_expire_clone(content)
		63	+ content_expire_for(content, "cloning")
		64	+ end
		65	+
		66	+ private
		67	+
		68	+ def content_expire_for(content, action)
59	if ToleranceTimePlugin.expired?(content)	69	if ToleranceTimePlugin.expired?(content)
60	- _('The tolerance time for editing this content is over.')	70	+ _('The tolerance time for %s this content is over.') % action
61	end	71	end
62	end	72	end
63	-
64	end	73	end