jro_apps/redmine Commit - r11735:e978b3ace0e8

Adds User#builtin_role....

Jean-Philippe Lang -

r11735:e978b3ace0e8

parent child

Context file:

r11735:e978b3ace0e8

app/models/project.rb +1 -1

                  else
                    statement_by_role = {}
                    unless options[:member]
-                     role = user.logged? ? Role.non_member : Role.anonymous
+                     role = user.builtin_role
                      if role.allowed_to?(permission)
                        statement_by_role[role] = "#{Project.table_name}.is_public = #{connection.quoted_true}"
                      end

app/models/user.rb +11 -4

                  @membership_by_project_id[project_id]
                end
+               # Returns the user's bult-in role
+               def builtin_role
+                 if logged?
+                   @role_non_member ||= Role.non_member
+                 else
+                   @role_anonymous ||= Role.anonymous
+                 end
+               end
                # Return user's roles for project
                def roles_for_project(project)
                  roles = []
                    if membership
                      roles = membership.roles
                    else
-                     @role_non_member ||= Role.non_member
-                     roles << @role_non_member
+                     roles << builtin_role
                    end
                  else
-                   @role_anonymous ||= Role.anonymous
-                   roles << @role_anonymous
+                   roles << builtin_role
                  end
                  roles
                end

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