Download as
Browse Code »

Commit 31b28c41edf306bba434a370d8d148585d725315

Authored by Braulio Bhavamitra
1 parent b5ca63ab
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: fix articles versions' tests

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @31b28c4
... ... @@ -449,7 +449,7 @@ class Article < ActiveRecord::Base
449 449  
450 450 def rotate_translations
451 451 unless self.translations.empty?
452   - rotate = self.translations
  452 + rotate = self.translations.all
453 453 root = rotate.shift
454 454 root.update_attribute(:translation_of_id, nil)
455 455 root.translations = rotate
... ... @@ -620,7 +620,7 @@ class Article < ActiveRecord::Base
620 620 ]
621 621  
622 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 624 end
625 625  
626 626 def hit
... ... @@ -679,11 +679,11 @@ class Article < ActiveRecord::Base
679 679 end
680 680  
681 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 683 end
684 684  
685 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 687 end
688 688  
689 689 def author_name(version_number = nil)
... ...
vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb
  Diff comments   View file @31b28c4
... ... @@ -264,7 +264,7 @@ module ActiveRecord #:nodoc:
264 264 included do
265 265 has_many :versions, self.version_association_options
266 266  
267   - #before_save :set_new_version
  267 + before_save :set_new_version
268 268 after_save :save_version
269 269 after_save :clear_old_versions
270 270 end
... ...