diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb index 655e3c4..c00dcae 100644 --- a/app/controllers/my_profile/cms_controller.rb +++ b/app/controllers/my_profile/cms_controller.rb @@ -144,7 +144,13 @@ class CmsController < MyProfileController article_data = environment.enabled?('articles_dont_accept_comments_by_default') ? { :accept_comments => false } : {} article_data.merge!(params[:article]) if params[:article] article_data.merge!(:profile => profile) if profile - @article = klass.new(article_data) + + if params[:clone] + current_article = profile.articles.find(params[:id]) + @article = current_article.dup + else + @article = klass.new(article_data) + end parent = check_parent(params[:parent_id]) if parent diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 64ee933..8126484 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -931,6 +931,26 @@ module ApplicationHelper article_helper.cms_label_for_edit end + def label_for_clone_article(article) + klass = class_to_s(article.class) + _("Clone #{klass}") + end + + def class_to_s(article_type) + classes = { + Folder => _("folder"), + Blog => _("blog"), + Event => _("event"), + Forum => _("forum"), + } + + if classes.has_key?(article_type) + classes[article_type] + else + _("article") + end + end + def add_rss_feed_to_head(title, url) content_for :feeds do tag(:link, :rel => 'alternate', :type => 'application/rss+xml', :title => title, :href => url_for(url)) diff --git a/app/views/content_viewer/_article_toolbar.html.erb b/app/views/content_viewer/_article_toolbar.html.erb index bf4f50f..e7aaeac 100644 --- a/app/views/content_viewer/_article_toolbar.html.erb +++ b/app/views/content_viewer/_article_toolbar.html.erb @@ -30,6 +30,10 @@ <% end %> <%= modal_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)))) unless remove_content_button(:new, @page) %> + + <% content = content_tag('span', label_for_clone_article(@page)) %> + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true, :type => @page.class }) %> + <%= expirable_button @page, :clone, content, url %> <% end %> <% if @page.accept_uploads? && @page.allow_create?(user) %> diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index 69a0ef4..11d1ed7 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -1811,6 +1811,14 @@ class CmsControllerTest < ActionController::TestCase assert_equal 'first version', assigns(:article).name end + should 'clone article with its content' do + article = profile.articles.create(:name => 'first version') + + get :new, :profile => profile.identifier, :id => article.id, :clone => true, :type => 'TinyMceArticle' + + assert_match article.name, @response.body + end + should 'save article with content from older version' do article = profile.articles.create(:name => 'first version') article.name = 'second version'; article.save diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb index a3661e6..8f98731 100644 --- a/test/unit/application_helper_test.rb +++ b/test/unit/application_helper_test.rb @@ -1009,6 +1009,14 @@ class ApplicationHelperTest < ActionView::TestCase assert html.include?("onClick=\"toggle_fullwidth('#article')\"") 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) + end + protected include NoosferoTestHelper -- libgit2 0.21.2