dmsf_file_revisions are ordered by id instead of major_version, minor_version and updated_at.

Previously they were ordered by major_version DESC, minor_version DESC and updated_at DESC.
This caused problems after restoring deleted files as the updated_at field were set to the same for all revisions,
and renamed files have the same major and minor version and could therefore be sorted in the wrong order.
Why would it not be ordered by id from the start?
This commit is contained in:
COLA@Redminetest 2016-11-24 22:23:46 +01:00
parent d2f3af0b88
commit 9e328c39ab

View File

@ -36,7 +36,7 @@ class DmsfFile < ActiveRecord::Base
belongs_to :dmsf_folder
belongs_to :deleted_by_user, :class_name => 'User', :foreign_key => 'deleted_by_user_id'
has_many :dmsf_file_revisions, -> { order("#{DmsfFileRevision.table_name}.major_version DESC, #{DmsfFileRevision.table_name}.minor_version DESC, #{DmsfFileRevision.table_name}.updated_at DESC") },
has_many :dmsf_file_revisions, -> { order("#{DmsfFileRevision.table_name}.id DESC") },
:dependent => :destroy
has_many :locks, -> { where(entity_type: 0).order("#{DmsfLock.table_name}.updated_at DESC") },
:class_name => 'DmsfLock', :foreign_key => 'entity_id', :dependent => :destroy