From a7aeae139478d20bc96e067ffb87541d432b7c48 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 9 Oct 2019 15:01:03 +0200
Subject: [PATCH] permissions: rename repository permissions to mention those
 are access permissions.

- Soon we'll introduce fine grained permissions for web-edit and artifacts that would require clear separation.
---
 docs/usage/keyboard-shortcuts.rst                          | 2 +-
 rhodecode/apps/repository/tests/test_repo_permissions.py   | 4 ++--
 rhodecode/apps/repository/views/repo_permissions.py        | 2 +-
 rhodecode/lib/auth.py                                      | 2 +-
 rhodecode/templates/admin/repos/repo_edit_permissions.mako | 2 +-
 rhodecode/templates/base/base.mako                         | 2 +-
 rhodecode/templates/base/perms_summary.mako                | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/usage/keyboard-shortcuts.rst b/docs/usage/keyboard-shortcuts.rst
index 11d467f7..ecae3511 100644
--- a/docs/usage/keyboard-shortcuts.rst
+++ b/docs/usage/keyboard-shortcuts.rst
@@ -56,4 +56,4 @@ Repository Shortcuts
         Go to the repository settings page.
 
     \--:kbd:`gO`
-        Go to the repository permissions settings.
+        Go to the repository access permissions settings.
diff --git a/rhodecode/apps/repository/tests/test_repo_permissions.py b/rhodecode/apps/repository/tests/test_repo_permissions.py
index facf0a67..af16f5bb 100644
--- a/rhodecode/apps/repository/tests/test_repo_permissions.py
+++ b/rhodecode/apps/repository/tests/test_repo_permissions.py
@@ -62,7 +62,7 @@ class TestRepoPermissionsView(object):
             route_path('edit_repo_perms',
                        repo_name=repo_name), form_data).follow()
 
-        assert 'Repository permissions updated' in response
+        assert 'Repository access permissions updated' in response
 
         # revoke given
         form_data = permission_update_data_generator(
@@ -74,4 +74,4 @@ class TestRepoPermissionsView(object):
             route_path('edit_repo_perms',
                        repo_name=repo_name), form_data).follow()
 
-        assert 'Repository permissions updated' in response
+        assert 'Repository access permissions updated' in response
diff --git a/rhodecode/apps/repository/views/repo_permissions.py b/rhodecode/apps/repository/views/repo_permissions.py
index aa2b13d8..070a236d 100644
--- a/rhodecode/apps/repository/views/repo_permissions.py
+++ b/rhodecode/apps/repository/views/repo_permissions.py
@@ -87,7 +87,7 @@ class RepoSettingsPermissionsView(RepoAppView):
             user=self._rhodecode_user, repo=self.db_repo)
 
         Session().commit()
-        h.flash(_('Repository permissions updated'), category='success')
+        h.flash(_('Repository access permissions updated'), category='success')
 
         PermissionModel().flush_user_permission_caches(changes)
 
diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index f39f7055..781949cd 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -723,7 +723,7 @@ class PermissionCalculator(object):
 
     def _calculate_repository_permissions(self):
         """
-        Repository permissions for the current user.
+        Repository access permissions for the current user.
 
         Check if the user is part of user groups for this repository and
         fill in the permission from it. `_choose_permission` decides of which
diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions.mako b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
index 8cbe571e..75a1c9a3 100644
--- a/rhodecode/templates/admin/repos/repo_edit_permissions.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
@@ -2,7 +2,7 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Repository Permissions')}</h3>
+        <h3 class="panel-title">${_('Repository Access Permissions')}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.route_path('edit_repo_perms', repo_name=c.repo_name), request=request)}
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 9141b8da..fa851041 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -1040,7 +1040,7 @@
                          ('g F', 'Goto files page with file search activated'),
                          ('g p', 'Goto pull requests page'),
                          ('g o', 'Goto repository settings'),
-                         ('g O', 'Goto repository permissions settings'),
+                         ('g O', 'Goto repository access permissions settings'),
                      ]
                   %>
                   %for key, desc in elems:
diff --git a/rhodecode/templates/base/perms_summary.mako b/rhodecode/templates/base/perms_summary.mako
index b99247af..94512436 100644
--- a/rhodecode/templates/base/perms_summary.mako
+++ b/rhodecode/templates/base/perms_summary.mako
@@ -7,7 +7,7 @@
 <% section_to_label = {
     'global': 'Global Permissions',
     'repository_branches': 'Repository Branch Rules',
-    'repositories': 'Repository Permissions',
+    'repositories': 'Repository Access Permissions',
     'user_groups': 'User Group Permissions',
     'repositories_groups': 'Repository Group Permissions',
 } %>