Changeset - 6245435fd8d7
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 10 years ago 2015-07-23 00:52:29
madski@unity3d.com
repogroups: use AvailableRepoGroupChoices
1 file changed with 18 insertions and 32 deletions:
kallithea/controllers/admin/repo_groups.py
18
32
0 comments (0 inline, 0 general)
kallithea/controllers/admin/repo_groups.py
➞
Show inline comments
 
@@ -41,13 +41,13 @@ from kallithea.lib import helpers as h
 
from kallithea.lib.compat import json
 
from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator,\
 
    HasRepoGroupPermissionAnyDecorator, HasRepoGroupPermissionAll,\
 
    HasPermissionAll
 
from kallithea.lib.base import BaseController, render
 
from kallithea.model.db import RepoGroup, Repository
 
from kallithea.model.scm import RepoGroupList
 
from kallithea.model.scm import RepoGroupList, AvailableRepoGroupChoices
 
from kallithea.model.repo_group import RepoGroupModel
 
from kallithea.model.forms import RepoGroupForm, RepoGroupPermsForm
 
from kallithea.model.meta import Session
 
from kallithea.model.repo import RepoModel
 
from webob.exc import HTTPInternalServerError, HTTPNotFound
 
from kallithea.lib.utils2 import safe_int
 
@@ -60,27 +60,23 @@ log = logging.getLogger(__name__)
 
class RepoGroupsController(BaseController):
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(RepoGroupsController, self).__before__()

			




	
	
	
		
 

			




	
	
	
		
 
    def __load_defaults(self, allow_empty_group=False, exclude_group_ids=[]):

			




	
	
	
		
 
        if HasPermissionAll('hg.admin')('group edit'):

			




	
	
	
		
 
            #we're global admin, we're ok and we can create TOP level groups

			




	
	
	
		
 
            allow_empty_group = True

			




	
	
	
		
 
    def __load_defaults(self, extras=(), exclude=()):

			




	
	
	
		
 
        """extras is used for keeping current parent ignoring permissions

			




	
	
	
		
 
        exclude is used for not moving group to itself TODO: also exclude descendants

			




	
	
	
		
 
        Note: only admin can create top level groups

			




	
	
	
		
 
        """

			




	
	
	
		
 
        repo_groups = AvailableRepoGroupChoices([], ['group.admin'], extras)

			




	
	
	
		
 
        exclude_group_ids = set(rg.group_id for rg in exclude)

			




	
	
	
		
 
        c.repo_groups = [rg for rg in repo_groups

			




	
	
	
		
 
                         if rg[0] not in exclude_group_ids]

			




	
	
	
		
 
        c.repo_groups_choices = [rg[0] for rg in c.repo_groups]

			




	
	
	
		
 

			




	
	
	
		
 
        #override the choices for this form, we need to filter choices

			




	
	
	
		
 
        #and display only those we have ADMIN right

			




	
	
	
		
 
        groups_with_admin_rights = RepoGroupList(RepoGroup.query().all(),

			




	
	
	
		
 
                                                 perm_set=['group.admin'])

			




	
	
	
		
 
        c.repo_groups = RepoGroup.groups_choices(groups=groups_with_admin_rights,

			




	
	
	
		
 
                                                 show_empty_group=allow_empty_group)

			




	
	
	
		
 
        # exclude filtered ids

			




	
	
	
		
 
        c.repo_groups = filter(lambda x: x[0] not in exclude_group_ids,

			




	
	
	
		
 
                               c.repo_groups)

			




	
	
	
		
 
        c.repo_groups_choices = map(lambda k: k[0], c.repo_groups)

			




	
	
	
		
 
        repo_model = RepoModel()

			




	
	
	
		
 
        c.users_array = repo_model.get_users_js()

			




	
	
	
		
 
        c.user_groups_array = repo_model.get_user_groups_js()

			




	
	
	
		
 

			




	
	
	
		
 
    def __load_data(self, group_id):

			




	
	
	
		
 
        """

			




	
	
		
 
@@ -165,14 +161,13 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
        # url('repos_groups')

			




	
	
	
		
 

			




	
	
	
		
 
        self.__load_defaults()

			




	
	
	
		
 

			




	
	
	
		
 
        # permissions for can create group based on parent_id are checked

			




	
	
	
		
 
        # here in the Form

			




	
	
	
		
 
        repo_group_form = RepoGroupForm(available_groups=

			




	
	
	
		
 
                                        map(lambda k: k[0], c.repo_groups))()

			




	
	
	
		
 
        repo_group_form = RepoGroupForm(available_groups=c.repo_groups_choices)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            form_result = repo_group_form.to_python(dict(request.POST))

			




	
	
	
		
 
            gr = RepoGroupModel().create(

			




	
	
	
		
 
                group_name=form_result['group_name'],

			




	
	
	
		
 
                group_description=form_result['group_description'],

			




	
	
	
		
 
                parent=form_result['group_parent_id'],

			




	
	
		
 
@@ -228,22 +223,23 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
        # Or using helpers:

			




	
	
	
		
 
        #    h.form(url('repos_group', group_name=GROUP_NAME),

			




	
	
	
		
 
        #           method='put')

			




	
	
	
		
 
        # url('repos_group', group_name=GROUP_NAME)

			




	
	
	
		
 

			




	
	
	
		
 
        c.repo_group = RepoGroupModel()._get_repo_group(group_name)

			




	
	
	
		
 
        self.__load_defaults(extras=[c.repo_group.parent_group],

			




	
	
	
		
 
                             exclude=[c.repo_group])

			




	
	
	
		
 

			




	
	
	
		
 
        # TODO: kill allow_empty_group - it is only used for redundant form validation!

			




	
	
	
		
 
        if HasPermissionAll('hg.admin')('group edit'):

			




	
	
	
		
 
            #we're global admin, we're ok and we can create TOP level groups

			




	
	
	
		
 
            allow_empty_group = True

			




	
	
	
		
 
        elif not c.repo_group.parent_group:

			




	
	
	
		
 
            allow_empty_group = True

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            allow_empty_group = False

			




	
	
	
		
 
        self.__load_defaults(allow_empty_group=allow_empty_group,

			




	
	
	
		
 
                             exclude_group_ids=[c.repo_group.group_id])

			




	
	
	
		
 

			




	
	
	
		
 
        repo_group_form = RepoGroupForm(

			




	
	
	
		
 
            edit=True,

			




	
	
	
		
 
            old_data=c.repo_group.get_dict(),

			




	
	
	
		
 
            available_groups=c.repo_groups_choices,

			




	
	
	
		
 
            can_create_in_root=allow_empty_group,

			




	
	
	
		
 
        )()

			




	
	
		
 
@@ -355,24 +351,14 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
    def edit(self, group_name):

			




	
	
	
		
 
        """GET /repo_groups/group_name/edit: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_repo_group', group_name=GROUP_NAME)

			




	
	
	
		
 
        c.active = 'settings'

			




	
	
	
		
 

			




	
	
	
		
 
        c.repo_group = RepoGroupModel()._get_repo_group(group_name)

			




	
	
	
		
 
        #we can only allow moving empty group if it's already a top-level

			




	
	
	
		
 
        #group, ie has no parents, or we're admin

			




	
	
	
		
 
        if HasPermissionAll('hg.admin')('group edit'):

			




	
	
	
		
 
            #we're global admin, we're ok and we can create TOP level groups

			




	
	
	
		
 
            allow_empty_group = True

			




	
	
	
		
 
        elif not c.repo_group.parent_group:

			




	
	
	
		
 
            allow_empty_group = True

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            allow_empty_group = False

			




	
	
	
		
 

			




	
	
	
		
 
        self.__load_defaults(allow_empty_group=allow_empty_group,

			




	
	
	
		
 
                             exclude_group_ids=[c.repo_group.group_id])

			




	
	
	
		
 
        self.__load_defaults(extras=[c.repo_group.parent_group],

			




	
	
	
		
 
                             exclude=[c.repo_group])

			




	
	
	
		
 
        defaults = self.__load_data(c.repo_group.group_id)

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/repo_groups/repo_group_edit.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.