Commit 31b28c41edf306bba434a370d8d148585d725315
1 parent
b5ca63ab
Exists in
master
and in
20 other branches
rails4: fix articles versions' tests
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
app/models/article.rb
| @@ -449,7 +449,7 @@ class Article < ActiveRecord::Base | @@ -449,7 +449,7 @@ class Article < ActiveRecord::Base | ||
| 449 | 449 | ||
| 450 | def rotate_translations | 450 | def rotate_translations |
| 451 | unless self.translations.empty? | 451 | unless self.translations.empty? |
| 452 | - rotate = self.translations | 452 | + rotate = self.translations.all |
| 453 | root = rotate.shift | 453 | root = rotate.shift |
| 454 | root.update_attribute(:translation_of_id, nil) | 454 | root.update_attribute(:translation_of_id, nil) |
| 455 | root.translations = rotate | 455 | root.translations = rotate |
| @@ -620,7 +620,7 @@ class Article < ActiveRecord::Base | @@ -620,7 +620,7 @@ class Article < ActiveRecord::Base | ||
| 620 | ] | 620 | ] |
| 621 | 621 | ||
| 622 | def self.find_by_old_path(old_path) | 622 | def self.find_by_old_path(old_path) |
| 623 | - self.includes(:versions).where( 'article_versions.path = ?', old_path).order('article_versions.id DESC') | 623 | + self.includes(:versions).where('article_versions.path = ?', old_path).order('article_versions.id DESC').first |
| 624 | end | 624 | end |
| 625 | 625 | ||
| 626 | def hit | 626 | def hit |
| @@ -679,11 +679,11 @@ class Article < ActiveRecord::Base | @@ -679,11 +679,11 @@ class Article < ActiveRecord::Base | ||
| 679 | end | 679 | end |
| 680 | 680 | ||
| 681 | def get_version(version_number = nil) | 681 | def get_version(version_number = nil) |
| 682 | - version_number ? versions.find(:first, :order => 'version', :offset => version_number - 1) : versions.earliest | 682 | + if version_number then self.versions.order('version').offset(version_number - 1).first else self.versions.earliest end |
| 683 | end | 683 | end |
| 684 | 684 | ||
| 685 | def author_by_version(version_number = nil) | 685 | def author_by_version(version_number = nil) |
| 686 | - version_number ? profile.environment.people.find_by_id(get_version(version_number).author_id) : author | 686 | + if version_number then profile.environment.people.where(id: get_version(version_number).author_id).first else author end |
| 687 | end | 687 | end |
| 688 | 688 | ||
| 689 | def author_name(version_number = nil) | 689 | def author_name(version_number = nil) |
vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb
| @@ -264,7 +264,7 @@ module ActiveRecord #:nodoc: | @@ -264,7 +264,7 @@ module ActiveRecord #:nodoc: | ||
| 264 | included do | 264 | included do |
| 265 | has_many :versions, self.version_association_options | 265 | has_many :versions, self.version_association_options |
| 266 | 266 | ||
| 267 | - #before_save :set_new_version | 267 | + before_save :set_new_version |
| 268 | after_save :save_version | 268 | after_save :save_version |
| 269 | after_save :clear_old_versions | 269 | after_save :clear_old_versions |
| 270 | end | 270 | end |