app/views/admin/pages/_copy_move_extra_td.haml app/views/admin/pages/_copy_move_extra_th.haml app/views/admin/pages/_copy_move_popup.haml lib/copy_move/model.rb @@ -4,7 +4,7 @@ module CopyMoveHelper list = homes.inject([]) do |l, home| l.concat build_tree(home, []) end - select_tag 'parent_id', options, options_for_select(list) + select_tag 'parent_id', options_for_select(list) end def build_tree(page, list, level = 0) app/helpers/copy_move_helper.rb @@ -7,10 +7,10 @@ class CopyMoveExtension < Radiant::Extension define_routes do |map| map.with_options(:controller => "admin/pages") do |cm| - cm.copy_admin_page 'admin/pages/:id/copy', :action => 'copy' - cm.copy_children_admin_page 'admin/pages/:id/copy_children', :action => 'copy_children' - cm.copy_tree_admin_page 'admin/pages/:id/copy_tree', :action => 'copy_tree' - cm.move_admin_page 'admin/pages/:id/move', :action => 'move' + cm.copy_page_admin_page '/admin/pages/:id/copy_page', :action => 'copy_page' + cm.copy_children_admin_page '/admin/pages/:id/copy_children', :action => 'copy_children' + cm.copy_tree_admin_page '/admin/pages/:id/copy_tree', :action => 'copy_tree' + cm.move_admin_page '/admin/pages/:id/move', :action => 'move' end end @@ -19,8 +19,9 @@ class CopyMoveExtension < Radiant::Extension include CopyMove::Controller helper :copy_move end - Page.class_eval { include CopyMove } + Page.class_eval { include CopyMove::Model } admin.page.index.add :sitemap_head, 'copy_move_extra_th' admin.page.index.add :node, 'copy_move_extra_td', :after => "add_child_column" + admin.page.index.add :bottom, 'copy_move_popup' end end copy_move_extension.rb @@ -5,47 +5,4 @@ module CopyMove super("Page #{record.title} cannot be made a descendant of itself.") end end - - def new_slug_and_title_under(parent) - test_page = self.clone - test_page.parent = parent - until test_page.valid? - index = (index || 0) + 1 - test_page.title = "#{title} (Copy#{' '+index if index > 1})" - test_page.slug = "#{slug}-#{index}" - end - {:slug => test_page.slug, :title => test_page.title} - end - - def move_under(parent) - raise CircularHierarchy.new(self) if parent == self || parent.ancestors.include?(self) - update_attributes!(:parent_id => parent.id) - end - - def copy_to(parent, status = nil) - parent.children.build(copiable_attributes.symbolize_keys.merge(new_slug_and_title_under(parent))).tap do |new_page| - self.parts.each do |part| - new_page.parts << part.clone - end - new_page.status_id = status || new_page.status_id - new_page.save! - end - end - - def copy_with_children_to(parent, status = nil) - copy_to(parent, status).tap do |new_page| - children.each {|child| child.copy_to(new_page, status) } - end - end - - def copy_tree_to(parent, status = nil) - copy_to(parent, status).tap do |new_page| - children.each {|child| child.copy_tree_to(new_page, status) } - end - end - - private - def copiable_attributes - self.attributes.dup.delete_if {|k,v| [:id, :parent_id].include?(k.to_sym) } - end end \ No newline at end of file lib/copy_move.rb @@ -5,87 +5,45 @@ module CopyMove before_filter do |c| c.include_stylesheet 'admin/copy_move' end - before_filter :load_model, :only => [:copy, :copy_children, :copy_tree, :move] - before_filter :load_parent, :only => [:copy, :copy_children, :copy_tree, :move] + before_filter :load_page, :only => [:copy_page, :copy_children, :copy_tree, :move] + before_filter :load_parent, :only => [:copy_page, :copy_children, :copy_tree, :move] end end - def copy - @new_page = @page.copy_to(@parent) - respond_to do |wants| - wants.html do - flash[:notice] = "A copy of #{@page.title} was created under #{@parent.title}." - redirect_to admin_pages_url - end - wants.xml do - render :xml => @new_page, :status => :created, :location => admin_page_url(@new_page, :format => params[:format]) - end - wants.json do - render :json => @new_page, :status => :created, :location => admin_page_url(@new_page, :format => params[:format]) - end - end + def copy_page + @new_page = @page.copy_to(@parent, params[:status_id]) + flash[:notice] = "A copy of #{@page.title} was created under #{@parent.title}." + redirect_to admin_pages_url end def copy_children - @new_page = @page.copy_with_children_to(@parent) - respond_to do |wants| - wants.html do - flash[:notice] = "Copies of #{@page.title} and its immediate children were created under #{@parent.title}." - redirect_to admin_pages_url - end - wants.xml do - render :xml => @new_page, :status => :created, :location => admin_page_url(@new_page, :format => params[:format]) - end - wants.json do - render :json => @new_page, :status => :created, :location => admin_page_url(@new_page, :format => params[:format]) - end - end + @new_page = @page.copy_with_children_to(@parent, params[:status_id]) + flash[:notice] = "Copies of #{@page.title} and its immediate children were created under #{@parent.title}." + redirect_to admin_pages_url end def copy_tree - @new_page = @page.copy_tree_to(@parent) - respond_to do |wants| - wants.html do - flash[:notice] = "Copies of #{@page.title} and all its descendants were created under #{@parent.title}." - redirect_to admin_pages_url - end - wants.xml do - render :xml => @new_page, :status => :created, :location => admin_page_url(@new_page, :format => params[:format]) - end - wants.json do - render :json => @new_page, :status => :created, :location => admin_page_url(@new_page, :format => params[:format]) - end - end + @new_page = @page.copy_tree_to(@parent, params[:status_id]) + flash[:notice] = "Copies of #{@page.title} and all its descendants were created under #{@parent.title}." + redirect_to admin_pages_url end def move @page.move_under(@parent) - respond_to do |wants| - wants.html do - flash[:notice] = "Page #{@page.title} and all its descendants were moved under #{@parent.title}." - redirect_to admin_pages_url - end - wants.xml do - render :xml => @page - end - wants.json do - render :json => @page - end - end + flash[:notice] = "Page #{@page.title} and all its descendants were moved under #{@parent.title}." + redirect_to admin_pages_url rescue CopyMove::CircularHierarchy => e - respond_to do |wants| - wants.html do - flash[:error] = e.message - redirect_to admin_pages_url - end - wants.xml { render :xml => e, :status => :conflict } - wants.json { render :json => e, :status => :conflict } - end + flash[:error] = e.message + redirect_to admin_pages_url end private def load_parent @parent = Page.find(params[:parent_id]) end + + def load_page + self.model = @page = Page.find(params[:id]) + end end end \ No newline at end of file lib/copy_move/controller.rb @@ -7,9 +7,9 @@ describe Admin::PagesController do end describe "routes" do - it "should route URLs to the copy action" do - route_for(:controller => "admin/pages", :action => "copy", :id => "1").should == "/admin/pages/1/copy" - params_from(:post, "/admin/pages/1/copy").should == {:controller => "admin/pages", :action => "copy", :id => "1"} + it "should route URLs to the copy_page action" do + route_for(:controller => "admin/pages", :action => "copy_page", :id => "1").should == "/admin/pages/1/copy_page" + params_from(:post, "/admin/pages/1/copy_page").should == {:controller => "admin/pages", :action => "copy_page", :id => "1"} end it "should route URLs to the copy_children action" do @@ -21,11 +21,16 @@ describe Admin::PagesController do route_for(:controller => "admin/pages", :action => "copy_tree", :id => "1").should == "/admin/pages/1/copy_tree" params_from(:post, "/admin/pages/1/copy_tree").should == {:controller => "admin/pages", :action => "copy_tree", :id => "1"} end + + it "should route URLs to the move action" do + route_for(:controller => "admin/pages", :action => "move", :id => "1").should == "/admin/pages/1/move" + params_from(:post, "/admin/pages/1/move").should == {:controller => "admin/pages", :action => "move", :id => "1"} + end end - describe "POST to /admin/pages/:id/copy" do + describe "POST to /admin/pages/:id/copy_page" do before :each do - post :copy, :id => page_id(:first), :parent_id => page_id(:another) + post :copy_page, :id => page_id(:first), :parent_id => page_id(:another) end it "should load the page" do spec/controllers/copy_move_controller_spec.rb @@ -26,7 +26,6 @@ describe CopyMove do it "should move to a new parent" do @page = pages(:first) lambda { @page.move_under(pages(:another)) }.should_not raise_error - @page.reload.parent.should == pages(:another) end end @@ -55,6 +54,11 @@ describe CopyMove do @new_page = @page.copy_to(pages(:another), Status[:draft].id) @new_page.status.should == Status[:draft] end + + it "should ignore a blank status" do + @new_page = @page.copy_to(pages(:another), ' ') + @new_page.status.should == Status[:published] + end end describe "copying the page with first-level children" do spec/models/copy_move_spec.rb app/controllers/copy_move_controller.rb app/views/admin/pages/_copy_move_extra_td.rhtml app/views/admin/pages/_copy_move_extra_th.rhtml app/views/copy_move/index.rhtml c12feaadbe7981c2c590904da5533fd8889dfacf Sean Cribbs seancribbs@gmail.com http://github.com/pilu/radiant-copy-move/commit/df0b237f24a393de6370a7b78dab40358aae356d df0b237f24a393de6370a7b78dab40358aae356d

2009-08-11T05:28:48-07:00

2009-07-24T07:25:50-07:00

Implement new interface. Signed-off-by: Andrea Franz <andrea@gravityblast.com> ed701c723df365c407be2735a347fd5cd7dad34b Andrea Franz andrea@gravityblast.com