summaryrefslogtreecommitdiff
path: root/app/controllers/revisions_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/revisions_controller.rb')
-rw-r--r--app/controllers/revisions_controller.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb
index cddb9e72..b8e66218 100644
--- a/app/controllers/revisions_controller.rb
+++ b/app/controllers/revisions_controller.rb
@@ -8,9 +8,9 @@ class RevisionsController < ApplicationController
8 layout 'admin' 8 layout 'admin'
9 9
10 def index 10 def index
11 @node = Node.find(params[:node_id]) 11 @node = Node.find(params[:node_id])
12 @pages = @node.pages.all 12 @pages = @node.pages.all
13 @locale = resolve_locale(params[:locale]) 13 @translation_locale = resolve_locale(params[:translation_locale])
14 end 14 end
15 15
16 def diff 16 def diff
@@ -31,21 +31,21 @@ class RevisionsController < ApplicationController
31 redirect_to(node_path(@node)) and return 31 redirect_to(node_path(@node)) and return
32 end 32 end
33 33
34 @locale_summary = @end.locale_diff_summary(@start) 34 @locale_summary = @end.locale_diff_summary(@start)
35 requested_locale = params[:locale].presence&.to_sym 35 requested_locale = params[:translation_locale].presence&.to_sym
36 default_locale = @locale_summary.find { |s| s[:changed] }&.dig(:locale) || I18n.default_locale 36 default_locale = @locale_summary.find { |s| s[:changed] }&.dig(:locale) || I18n.default_locale
37 @locale = @locale_summary.any? { |s| s[:locale] == requested_locale } ? requested_locale : default_locale 37 @translation_locale = @locale_summary.any? { |s| s[:locale] == requested_locale } ? requested_locale : default_locale
38 38
39 @diff_view = params[:view] == "side_by_side" ? :side_by_side : :inline 39 @diff_view = params[:view] == "side_by_side" ? :side_by_side : :inline
40 @diff = @end.diff_against(@start, view: @diff_view, locale: @locale) 40 @diff = @end.diff_against(@start, view: @diff_view, locale: @translation_locale)
41 @available_layer_pairs = @node.available_layer_pairs 41 @available_layer_pairs = @node.available_layer_pairs
42 @locked_by_other = @node.locked? && @node.lock_owner != current_user 42 @locked_by_other = @node.locked? && @node.lock_owner != current_user
43 end 43 end
44 44
45 def show 45 def show
46 @node = Node.find(params[:node_id]) 46 @node = Node.find(params[:node_id])
47 @page = @node.pages.find(params[:id]) 47 @page = @node.pages.find(params[:id])
48 @locale = resolve_locale(params[:locale]) 48 @translation_locale = resolve_locale(params[:translation_locale])
49 end 49 end
50 50
51 def restore 51 def restore