From 6cc4b53897170ee345cdefa7f7669ba893f2b115 Mon Sep 17 00:00:00 2001 From: Simiao Carvalho Date: Wed, 12 Aug 2015 17:45:59 -0300 Subject: [PATCH] Article cloned passing parent by options --- app/controllers/my_profile/cms_controller.rb | 2 +- app/models/article.rb | 1 + app/views/content_viewer/_article_toolbar.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb index 9ff7a92..b0dd31d 100644 --- a/app/controllers/my_profile/cms_controller.rb +++ b/app/controllers/my_profile/cms_controller.rb @@ -157,7 +157,7 @@ class CmsController < MyProfileController @article = if params[:clone] current_article = profile.articles.find(params[:id]) - current_article.copy_without_save + current_article.copy_without_save({:parent_id => @parent_id}) else klass.new(article_data) end diff --git a/app/models/article.rb b/app/models/article.rb index 841308f..44bc601 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -605,6 +605,7 @@ class Article < ActiveRecord::Base ATTRIBUTES_NOT_COPIED = [ :id, :profile_id, + :parent_id, :path, :slug, :updated_at, diff --git a/app/views/content_viewer/_article_toolbar.html.erb b/app/views/content_viewer/_article_toolbar.html.erb index b364e04..4d3cfb5 100644 --- a/app/views/content_viewer/_article_toolbar.html.erb +++ b/app/views/content_viewer/_article_toolbar.html.erb @@ -32,7 +32,7 @@ <%= 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 }) %> + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true, :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)), :type => @page.type}) %> <%= expirable_button @page, :clone, content, url %> <% end %> -- libgit2 0.21.2