Преглед на файлове

Rails 6: Fix deprecation warning "Class level methods will no longer inherit scoping" (#32911).

Patch by Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@19490 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Go MAEDA преди 4 години
родител
ревизия
01f523f165
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2
    2
      app/models/user.rb
  2. 1
    1
      lib/redmine/acts/positioned.rb

+ 2
- 2
app/models/user.rb Целия файл

@@ -634,7 +634,7 @@ class User < Principal
Project.unscoped do
return @project_ids_by_role if @project_ids_by_role

group_class = anonymous? ? GroupAnonymous : GroupNonMember
group_class = anonymous? ? GroupAnonymous.unscoped : GroupNonMember.unscoped
group_id = group_class.pluck(:id).first

members = Member.joins(:project, :member_roles).
@@ -970,7 +970,7 @@ class AnonymousUser < User

def validate_anonymous_uniqueness
# There should be only one AnonymousUser in the database
errors.add :base, 'An anonymous user already exists.' if AnonymousUser.exists?
errors.add :base, 'An anonymous user already exists.' if AnonymousUser.unscoped.exists?
end

def available_custom_fields

+ 1
- 1
lib/redmine/acts/positioned.rb Целия файл

@@ -66,7 +66,7 @@ module Redmine
h[column] = yield(column)
h
end
self.class.where(condition_hash)
self.class.unscoped.where(condition_hash)
end

def set_default_position

Loading…
Отказ
Запис