@@ -7,13 +7,13 @@ class ConcurrentDraftExtension < Radiant::Extension url "http://github.com/avonderluft/concurrent_draft/tree/master" define_routes do |map| - map.page_schedule_draft_promotion 'admin/pages/:id/schedule_draft_promotion', + map.page_schedule_draft_promotion 'admin/pages/schedule_draft_promotion/:id', :controller => 'admin/pages', :action => 'schedule_draft_promotion' - map.snippet_schedule_draft_promotion 'admin/snippet/:id/schedule_draft_promotion', + map.snippet_schedule_draft_promotion 'admin/snippet/schedule_draft_promotion/:id', :controller => 'admin/snippets', :action => 'schedule_draft_promotion' - map.layout_schedule_draft_promotion 'admin/layout/:id/schedule_draft_promotion', + map.layout_schedule_draft_promotion 'admin/layout/schedule_draft_promotion/:id', :controller => 'admin/layouts', :action => 'schedule_draft_promotion' - map.page_unpublish 'admin/pages/:id/unpublish', :controller => 'admin/pages', :action => 'unpublish' + map.page_unpublish 'admin/pages/unpublish/:id', :controller => 'admin/pages', :action => 'unpublish' end def activate concurrent_draft_extension.rb @@ -8,7 +8,7 @@ module ConcurrentDraft::AdminControllerExtensions :when => [:publisher, :admin], :denied_message => "You must have publisher privileges to execute this action.", :denied_url => {:action => 'edit'} - after_filter :check_for_promote_now, :only => :update + after_filter :check_for_promote_now, :only => [:create, :update] end end @@ -17,9 +17,11 @@ module ConcurrentDraft::AdminControllerExtensions end def check_for_promote_now - model.promote_draft! if params[:promote] && authorized_user? - flash[:notice] = "The existing draft #{model_class.to_s.downcase} has been saved and promoted, and is now live." - flash.keep + if params[:promote] && authorized_user? + model.promote_draft! + flash[:notice] = "The existing draft #{model_class.to_s.downcase} has been saved and promoted, and is now live." + flash.keep + end end def schedule_draft_promotion lib/concurrent_draft/admin_controller_extensions.rb 5331982e2f73d95a66cb4115d41df1f353b93192 Andrew vonderLuft avonderluft@avlux.net http://github.com/avonderluft/radiant-concurrent_draft-extension/commit/432f4a3cb39fd091cc6ded57baebfcb770c3aa28 432f4a3cb39fd091cc6ded57baebfcb770c3aa28 2009-04-16T08:34:24-07:00 2009-04-16T08:34:24-07:00 handle promote now with newly created page; fix routes. 585f00179326efb46de9e16a8df510b10f1b8d0e Andrew vonderLuft avonderluft@avlux.net