engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

permissions: rename write+ to write or higher for more explicit meaning.

Browse source
This commit is contained in:
Marcin Kuzminski 2020-07-24 12:23:53 +02:00
parent a20d45c20e
commit dec6e7afda
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/apps/repository/views/repo_permissions.py
View file

@ -54,7 +54,7 @@ class RepoSettingsPermissionsView(RepoAppView):
c = self.load_default_context()
c.active = 'permissions'
if self.request.GET.get('branch_permissions'):
h.flash(_('Explicitly add user or user group with write+ '
h.flash(_('Explicitly add user or user group with write or higher '
'permission to modify their branch permissions.'),
category='notice')
return self._get_template_context(c)

2
rhodecode/apps/ssh_support/lib/backends/base.py
View file

@ -83,7 +83,7 @@ class VcsServer(object):
else:
if permission in self.write_perms:
log.info(
'WRITE+ Permissions for User "%s" detected to repo "%s"!',
'WRITE, or Higher Permissions for User "%s" detected to repo "%s"!',
self.user, self.repo_name)
return 0

4
rhodecode/model/permission.py
View file

@ -561,7 +561,7 @@ class PermissionModel(BaseModel):
default_user_id = User.get_default_user_id()
user_write_permissions = collections.OrderedDict()
# write+ and DEFAULT user for inheritance
# write or higher and DEFAULT user for inheritance
for perm in db_repo.permissions():
if perm.permission in write_plus or perm.user_id == default_user_id:
user_write_permissions[perm.user_id] = perm
@ -571,7 +571,7 @@ class PermissionModel(BaseModel):
write_plus = ['repository.write', 'repository.admin']
user_group_write_permissions = collections.OrderedDict()
# write+ and DEFAULT user for inheritance
# write or higher and DEFAULT user for inheritance
for p in db_repo.permission_user_groups():
if p.permission in write_plus:
user_group_write_permissions[p.users_group_id] = p

4
rhodecode/templates/admin/repos/repo_edit_permissions.mako
View file

@ -106,9 +106,9 @@
%if getattr(_user, 'branch_rules', None):
% if used_by_n_rules == 1:
(${_('used by {} branch rule, requires write+ permissions').format(used_by_n_rules)})
(${_('used by {} branch rule, requires write or higher permissions').format(used_by_n_rules)})
% else:
(${_('used by {} branch rules, requires write+ permissions').format(used_by_n_rules)})
(${_('used by {} branch rules, requires write or higher permissions').format(used_by_n_rules)})
% endif
%endif
% endif