# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2019-01-15 20:04:30
# Node ID 061bf4696e83ec9431aba97b1eee1bd4a5ce5f52
# Parent  18125a8e37986ff10698241bf011146391552281

permissions: flush permissions correctly for forks/repos when celery is used.

diff --git a/rhodecode/apps/admin/views/repositories.py b/rhodecode/apps/admin/views/repositories.py
--- a/rhodecode/apps/admin/views/repositories.py
+++ b/rhodecode/apps/admin/views/repositories.py
@@ -180,13 +180,8 @@ class AdminReposView(BaseAppView, DataGr
 
         affected_user_ids = [self._rhodecode_user.user_id]
         if copy_permissions:
-            repository = Repository.get_by_repo_name(repo_name)
-            # also include those newly created by copy
-            user_group_perms = repository.permissions(expand_from_user_groups=True)
-            copy_perms = [perm['user_id'] for perm in user_group_perms]
-            # also include those newly created by copy
-            affected_user_ids.extend(copy_perms)
-
+            # permission flush is done in repo creating
+            pass
         events.trigger(events.UserPermissionsChange(affected_user_ids))
 
         raise HTTPFound(
diff --git a/rhodecode/apps/repository/views/repo_checks.py b/rhodecode/apps/repository/views/repo_checks.py
--- a/rhodecode/apps/repository/views/repo_checks.py
+++ b/rhodecode/apps/repository/views/repo_checks.py
@@ -23,6 +23,7 @@ import logging
 from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 
+from rhodecode import events
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (NotAnonymous, HasRepoPermissionAny)
@@ -50,6 +51,8 @@ class RepoChecksView(BaseAppView):
 
         # check if maybe repo is already created
         if db_repo and db_repo.repo_state in [Repository.STATE_CREATED]:
+            self.flush_permissions_on_creation(db_repo)
+
             # re-check permissions before redirecting to prevent resource
             # discovery by checking the 302 code
             perm_set = ['repository.read', 'repository.write', 'repository.admin']
@@ -110,5 +113,13 @@ class RepoChecksView(BaseAppView):
                 else:
                     h.flash(h.literal(_('Created repository %s') % repo_url),
                             category='success')
+            self.flush_permissions_on_creation(db_repo)
+
             return {'result': True}
         return {'result': False}
+
+    def flush_permissions_on_creation(self, db_repo):
+        # repo is finished and created, we flush the permissions now
+        user_group_perms = db_repo.permissions(expand_from_user_groups=True)
+        affected_user_ids = [perm['user_id'] for perm in user_group_perms]
+        events.trigger(events.UserPermissionsChange(affected_user_ids))
diff --git a/rhodecode/apps/repository/views/repo_forks.py b/rhodecode/apps/repository/views/repo_forks.py
--- a/rhodecode/apps/repository/views/repo_forks.py
+++ b/rhodecode/apps/repository/views/repo_forks.py
@@ -256,12 +256,8 @@ class RepoForksView(RepoAppView, DataGri
 
         affected_user_ids = [self._rhodecode_user.user_id]
         if copy_permissions:
-            repository = Repository.get_by_repo_name(repo_name)
-            # also include those newly created by copy
-            user_group_perms = repository.permissions(expand_from_user_groups=True)
-            copy_perms = [perm['user_id'] for perm in user_group_perms]
-            # also include those newly created by copy
-            affected_user_ids.extend(copy_perms)
+            # permission flush is done in repo creating
+            pass
 
         events.trigger(events.UserPermissionsChange(affected_user_ids))