jro_apps/redmine Commit - r15771:3deb70d4aab9

Don't preload projects and roles on Principal#memberships association (#23519)....

Jean-Philippe Lang -

r15771:3deb70d4aab9

parent child

Context file:

r15771:3deb70d4aab9

app/controllers/users_controller.rb +1 -1

                 end
                 # show projects based on current user visibility
-                @memberships = @user.memberships.where(Project.visible_condition(User.current)).to_a
+                @memberships = @user.memberships.preload(:roles, :project).where(Project.visible_condition(User.current)).to_a
                 respond_to do |format|
                   format.html {

app/models/principal.rb +1 -2

               has_many :members, :foreign_key => 'user_id', :dependent => :destroy
               has_many :memberships,
-                       lambda {preload(:project, :roles).
+                       lambda {joins(:project).
-                               joins(:project).
                                where("#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}")},
                        :class_name => 'Member',
                        :foreign_key => 'user_id'

app/models/user.rb +7 -3

                 @membership_by_project_id[project_id]
               end
+              def roles
+                @roles ||= Role.joins(members: :project).where(["#{Project.table_name}.status <> ?", Project::STATUS_ARCHIVED]).where(Member.arel_table[:user_id].eq(id)).uniq
+              end
               # Returns the user's bult-in role
               def builtin_role
                 @builtin_role ||= Role.non_member
                   return true if admin?
                   # authorize if user has at least one role that has this permission
-                  roles = memberships.collect {|m| m.roles}.flatten.uniq
+                  rls = self.roles.to_a
-                  roles << (self.logged? ? Role.non_member : Role.anonymous)
+                  rls << builtin_role
-                  roles.any? {|role|
+                  rls.any? {|role|
                     role.allowed_to?(action) &&
                     (block_given? ? yield(role, self) : true)
                   }

app/views/groups/show.api.rsb +2 -2

               end if include_in_api_response?('users') && !@group.builtin?
               api.array :memberships do
-                @group.memberships.each do |membership|
+                @group.memberships.preload(:roles, :project).each do |membership|
                   api.membership do
                     api.id membership.id
                     api.project :id => membership.project.id, :name => membership.project.name
                           attrs = {:id => member_role.role.id, :name => member_role.role.name}
                           attrs.merge!(:inherited => true) if member_role.inherited_from.present?
                           api.role attrs
                         end
                       end
                     end
                   end if membership.project

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages