From 33bf6dddf3a78b1ab12bbac3f3828c407c9ccd44 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 26 Jul 2017 16:48:13 +0000 Subject: [PATCH] Code cleanup. git-svn-id: http://svn.redmine.org/redmine/trunk@16891 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/wiki_content_version.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/wiki_content_version.rb b/app/models/wiki_content_version.rb index 73d708ca8..fb4c35cbb 100644 --- a/app/models/wiki_content_version.rb +++ b/app/models/wiki_content_version.rb @@ -89,7 +89,7 @@ class WikiContentVersion < ActiveRecord::Base # Returns the previous version or nil def previous @previous ||= WikiContentVersion. - reorder('version DESC'). + reorder(version: :desc). includes(:author). where("wiki_content_id = ? AND version < ?", wiki_content_id, version).first end @@ -97,7 +97,7 @@ class WikiContentVersion < ActiveRecord::Base # Returns the next version or nil def next @next ||= WikiContentVersion. - reorder('version ASC'). + reorder(version: :asc). includes(:author). where("wiki_content_id = ? AND version > ?", wiki_content_id, version).first end @@ -107,7 +107,7 @@ class WikiContentVersion < ActiveRecord::Base # Updates page's content if the latest version is removed # or destroys the page if it was the only version def page_update_after_destroy - latest = page.content.versions.reorder("#{self.class.table_name}.version DESC").first + latest = page.content.versions.reorder(version: :desc).first if latest && page.content.version != latest.version raise ActiveRecord::Rollback unless page.content.revert_to!(latest) elsif latest.nil? -- 2.39.5