diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/nodes_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/page_translations_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/revisions_controller.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index ed5f8ef..b66ea49 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb | |||
| @@ -50,6 +50,9 @@ class NodesController < ApplicationController | |||
| 50 | @node.draft.save! | 50 | @node.draft.save! |
| 51 | 51 | ||
| 52 | @node.update!(default_template_name: config[:template]) if config && config[:template] | 52 | @node.update!(default_template_name: config[:template]) if config && config[:template] |
| 53 | NodeAction.record!(:node => @node, :page => @node.draft, :user => current_user, | ||
| 54 | :action => "create", | ||
| 55 | :title => params[:title], :path => @node.unique_name) | ||
| 53 | 56 | ||
| 54 | redirect_to(edit_node_path(@node)) | 57 | redirect_to(edit_node_path(@node)) |
| 55 | else | 58 | else |
diff --git a/app/controllers/page_translations_controller.rb b/app/controllers/page_translations_controller.rb index be4f488..38a7c4f 100644 --- a/app/controllers/page_translations_controller.rb +++ b/app/controllers/page_translations_controller.rb | |||
| @@ -63,9 +63,6 @@ class PageTranslationsController < ApplicationController | |||
| 63 | draft.translations.where(:locale => @locale).delete_all | 63 | draft.translations.where(:locale => @locale).delete_all |
| 64 | draft.reload | 64 | draft.reload |
| 65 | 65 | ||
| 66 | NodeAction.record!(:node => @node, :page => draft, :user => current_user, | ||
| 67 | :action => "translation_destroy", :locale => @locale) | ||
| 68 | |||
| 69 | flash[:notice] = "#{@locale.upcase} translation removed from the draft. Publish to make this permanent." | 66 | flash[:notice] = "#{@locale.upcase} translation removed from the draft. Publish to make this permanent." |
| 70 | redirect_to node_path(@node) | 67 | redirect_to node_path(@node) |
| 71 | rescue LockedByAnotherUser => e | 68 | rescue LockedByAnotherUser => e |
diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb index c5932a4..c1237a9 100644 --- a/app/controllers/revisions_controller.rb +++ b/app/controllers/revisions_controller.rb | |||
| @@ -49,7 +49,7 @@ class RevisionsController < ApplicationController | |||
| 49 | 49 | ||
| 50 | def restore | 50 | def restore |
| 51 | page = Page.find(params[:id]) | 51 | page = Page.find(params[:id]) |
| 52 | page.node.restore_revision! page.revision | 52 | page.node.restore_revision! page.revision, current_user |
| 53 | flash[:notice] = "Revision #{page.revision} restored" | 53 | flash[:notice] = "Revision #{page.revision} restored" |
| 54 | redirect_to node_path(page.node) | 54 | redirect_to node_path(page.node) |
| 55 | end | 55 | end |
