Redmine 4.1.1
This commit is contained in:
parent
33e7b881a5
commit
3d976f1b3b
1593 changed files with 36180 additions and 19489 deletions
|
@ -1,6 +1,7 @@
|
|||
api.user do
|
||||
api.id @user.id
|
||||
api.login @user.login if User.current.admin? || (User.current == @user)
|
||||
api.login @user.login
|
||||
api.admin @user.admin? if User.current.admin? || (User.current == @user)
|
||||
api.firstname @user.firstname
|
||||
api.lastname @user.lastname
|
||||
api.mail @user.mail if User.current.admin? || !@user.pref.hide_mail
|
||||
|
@ -28,7 +29,7 @@ api.user do
|
|||
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
|
||||
end if membership.project
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue