# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2020-07-24 10:23:53
# Node ID 91b375f2b037901ed05b6c54d46c83646633015a
# Parent  2b31e8f817b10eba790863613f557e325815196f

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

diff --git a/rhodecode/apps/repository/views/repo_permissions.py b/rhodecode/apps/repository/views/repo_permissions.py
--- a/rhodecode/apps/repository/views/repo_permissions.py
+++ b/rhodecode/apps/repository/views/repo_permissions.py
@@ -54,7 +54,7 @@ class RepoSettingsPermissionsView(RepoAp
         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)
diff --git a/rhodecode/apps/ssh_support/lib/backends/base.py b/rhodecode/apps/ssh_support/lib/backends/base.py
--- a/rhodecode/apps/ssh_support/lib/backends/base.py
+++ b/rhodecode/apps/ssh_support/lib/backends/base.py
@@ -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
 
diff --git a/rhodecode/model/permission.py b/rhodecode/model/permission.py
--- a/rhodecode/model/permission.py
+++ b/rhodecode/model/permission.py
@@ -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
diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions.mako b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
--- a/rhodecode/templates/admin/repos/repo_edit_permissions.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
@@ -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