# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2015-07-23 00:52:29
# Node ID 9d4c4d4d9e167df3de3c9b10fced6c5b4c96e66a
# Parent  b52b0496b9f6d2c6ffec20ba4f9f042f3883a617

forks: use AvailableRepoGroupChoices

diff --git a/kallithea/controllers/forks.py b/kallithea/controllers/forks.py
--- a/kallithea/controllers/forks.py
+++ b/kallithea/controllers/forks.py
@@ -44,7 +44,7 @@ from kallithea.model.db import Repositor
     Ui
 from kallithea.model.repo import RepoModel
 from kallithea.model.forms import RepoForkForm
-from kallithea.model.scm import ScmModel, RepoGroupList
+from kallithea.model.scm import ScmModel, AvailableRepoGroupChoices
 from kallithea.lib.utils2 import safe_int
 
 log = logging.getLogger(__name__)
@@ -59,12 +59,11 @@ class ForksController(BaseRepoController
         repo_group_perms = ['group.admin']
         if HasPermissionAny('hg.create.write_on_repogroup.true')():
             repo_group_perms.append('group.write')
-        acl_groups = RepoGroupList(RepoGroup.query().all(),
-                               perm_set=repo_group_perms)
-        c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
-        c.repo_groups_choices = map(lambda k: k[0], c.repo_groups)
-        choices, c.landing_revs = ScmModel().get_repo_landing_revs()
-        c.landing_revs_choices = choices
+        c.repo_groups = AvailableRepoGroupChoices(['hg.create.repository'], repo_group_perms)
+        c.repo_groups_choices = [rg[0] for rg in c.repo_groups]
+
+        c.landing_revs_choices, c.landing_revs = ScmModel().get_repo_landing_revs()
+
         c.can_update = Ui.get_by_key(Ui.HOOK_UPDATE).ui_active
 
     def __load_data(self, repo_name=None):