Changeset - 4ebce2642888
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Mads Kiilerich - 9 years ago 2016-08-04 14:23:36
madski@unity3d.com
controllers: remove some empty controllers, their "tests", and their unused routing
6 files changed with 0 insertions and 58 deletions:
kallithea/config/routing.py
19
kallithea/controllers/admin/notifications.py
12
kallithea/controllers/admin/user_groups.py
4
kallithea/controllers/admin/users.py
5
kallithea/tests/functional/test_admin_user_groups.py
15
kallithea/tests/functional/test_admin_users.py
3
0 comments (0 inline, 0 general)
kallithea/config/routing.py
➞
Show inline comments
 
@@ -169,50 +169,48 @@ def make_map(config):
 
                  conditions=dict(method=["DELETE"], function=check_group))
 

			




	
	
	
		
 
        m.connect("delete_repo_group", "/repo_groups/{group_name:.*?}",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["DELETE"],

			




	
	
	
		
 
                                                   function=check_group_skip_path))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    #ADMIN USER ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/users') as m:

			




	
	
	
		
 
        m.connect("users", "/users",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("users", "/users",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("formatted_users", "/users.{format}",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_user", "/users/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("update_user", "/users/{id}",

			




	
	
	
		
 
                  action="update", conditions=dict(method=["PUT"]))

			




	
	
	
		
 
        m.connect("delete_user", "/users/{id}",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 
        m.connect("edit_user", "/users/{id}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("user", "/users/{id}",

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        #EXTRAS USER ROUTES

			




	
	
	
		
 
        m.connect("edit_user_advanced", "/users/{id}/edit/advanced",

			




	
	
	
		
 
                  action="edit_advanced", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("edit_user_advanced", "/users/{id}/edit/advanced",

			




	
	
	
		
 
                  action="update_advanced", conditions=dict(method=["PUT"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys",

			




	
	
	
		
 
                  action="edit_api_keys", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys",

			




	
	
	
		
 
                  action="add_api_key", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys",

			




	
	
	
		
 
                  action="delete_api_key", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("edit_user_perms", "/users/{id}/edit/permissions",

			




	
	
	
		
 
                  action="edit_perms", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("edit_user_perms", "/users/{id}/edit/permissions",

			




	
	
	
		
 
                  action="update_perms", conditions=dict(method=["PUT"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("edit_user_emails", "/users/{id}/edit/emails",

			




	
	
	
		
 
                  action="edit_emails", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("edit_user_emails", "/users/{id}/edit/emails",

			




	
	
	
		
 
                  action="add_email", conditions=dict(method=["PUT"]))

			




	
	
	
		
 
        m.connect("edit_user_emails", "/users/{id}/edit/emails",

			




	
	
		
 
@@ -220,89 +218,83 @@ def make_map(config):

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("edit_user_ips", "/users/{id}/edit/ips",

			




	
	
	
		
 
                  action="edit_ips", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("edit_user_ips", "/users/{id}/edit/ips",

			




	
	
	
		
 
                  action="add_ip", conditions=dict(method=["PUT"]))

			




	
	
	
		
 
        m.connect("edit_user_ips", "/users/{id}/edit/ips",

			




	
	
	
		
 
                  action="delete_ip", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 

			




	
	
	
		
 
    #ADMIN USER GROUPS REST ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/user_groups') as m:

			




	
	
	
		
 
        m.connect("users_groups", "/user_groups",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("users_groups", "/user_groups",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_users_group", "/user_groups/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("update_users_group", "/user_groups/{id}",

			




	
	
	
		
 
                  action="update", conditions=dict(method=["PUT"]))

			




	
	
	
		
 
        m.connect("delete_users_group", "/user_groups/{id}",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 
        m.connect("edit_users_group", "/user_groups/{id}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET"]),

			




	
	
	
		
 
                  function=check_user_group)

			




	
	
	
		
 
        m.connect("users_group", "/user_groups/{id}",

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        #EXTRAS USER GROUP ROUTES

			




	
	
	
		
 
        m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms",

			




	
	
	
		
 
                  action="edit_default_perms", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms",

			




	
	
	
		
 
                  action="update_default_perms", conditions=dict(method=["PUT"]))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("edit_user_group_perms", "/user_groups/{id}/edit/perms",

			




	
	
	
		
 
                  action="edit_perms", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("edit_user_group_perms", "/user_groups/{id}/edit/perms",

			




	
	
	
		
 
                  action="update_perms", conditions=dict(method=["PUT"]))

			




	
	
	
		
 
        m.connect("edit_user_group_perms", "/user_groups/{id}/edit/perms",

			




	
	
	
		
 
                  action="delete_perms", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("edit_user_group_advanced", "/user_groups/{id}/edit/advanced",

			




	
	
	
		
 
                  action="edit_advanced", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("edit_user_group_members", "/user_groups/{id}/edit/members",

			




	
	
	
		
 
                  action="edit_members", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    #ADMIN PERMISSIONS ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/permissions') as m:

			




	
	
	
		
 
        m.connect("admin_permissions", "/permissions",

			




	
	
	
		
 
                  action="permission_globals", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("admin_permissions", "/permissions",

			




	
	
	
		
 
                  action="permission_globals", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("admin_permissions_ips", "/permissions/ips",

			




	
	
	
		
 
                  action="permission_ips", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("admin_permissions_ips", "/permissions/ips",

			




	
	
	
		
 
                  action="permission_ips", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("admin_permissions_perms", "/permissions/perms",

			




	
	
	
		
 
                  action="permission_perms", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("admin_permissions_perms", "/permissions/perms",

			




	
	
	
		
 
                  action="permission_perms", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    #ADMIN DEFAULTS REST ROUTES

			




	
	
	
		
 
    rmap.resource('default', 'defaults',

			




	
	
	
		
 
                  controller='admin/defaults', path_prefix=ADMIN_PREFIX)

			




	
	
	
		
 

			




	
	
	
		
 
    #ADMIN AUTH SETTINGS

			




	
	
	
		
 
    rmap.connect('auth_settings', '%s/auth' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='admin/auth_settings', action='auth_settings',

			




	
	
	
		
 
                 conditions=dict(method=["POST"]))

			




	
	
	
		
 
    rmap.connect('auth_home', '%s/auth' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='admin/auth_settings')

			




	
	
	
		
 

			




	
	
	
		
 
    #ADMIN SETTINGS ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/settings') as m:

			




	
	
	
		
 
        m.connect("admin_settings", "/settings",

			




	
	
	
		
 
                  action="settings_vcs", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("admin_settings", "/settings",

			




	
	
	
		
 
                  action="settings_vcs", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("admin_settings_mapping", "/settings/mapping",

			




	
	
	
		
 
                  action="settings_mapping", conditions=dict(method=["POST"]))

			




	
	
		
 
@@ -363,68 +355,57 @@ def make_map(config):

			




	
	
	
		
 
        m.connect("my_account_watched", "/my_account/watched",

			




	
	
	
		
 
                  action="my_account_watched", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("my_account_perms", "/my_account/perms",

			




	
	
	
		
 
                  action="my_account_perms", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("my_account_emails", "/my_account/emails",

			




	
	
	
		
 
                  action="my_account_emails", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("my_account_emails", "/my_account/emails",

			




	
	
	
		
 
                  action="my_account_emails_add", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("my_account_emails", "/my_account/emails",

			




	
	
	
		
 
                  action="my_account_emails_delete", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("my_account_api_keys", "/my_account/api_keys",

			




	
	
	
		
 
                  action="my_account_api_keys", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("my_account_api_keys", "/my_account/api_keys",

			




	
	
	
		
 
                  action="my_account_api_keys_add", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("my_account_api_keys", "/my_account/api_keys",

			




	
	
	
		
 
                  action="my_account_api_keys_delete", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 

			




	
	
	
		
 
    #NOTIFICATION REST ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/notifications') as m:

			




	
	
	
		
 
        m.connect("notifications", "/notifications",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("notifications", "/notifications",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("notifications_mark_all_read", "/notifications/mark_all_read",

			




	
	
	
		
 
                  action="mark_all_read", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("formatted_notifications", "/notifications.{format}",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_notification", "/notifications/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("formatted_new_notification", "/notifications/new.{format}",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("/notifications/{notification_id}",

			




	
	
	
		
 
                  action="update", conditions=dict(method=["PUT"]))

			




	
	
	
		
 
        m.connect("/notifications/{notification_id}",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 
        m.connect("edit_notification", "/notifications/{notification_id}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("formatted_edit_notification",

			




	
	
	
		
 
                  "/notifications/{notification_id}.{format}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("notification", "/notifications/{notification_id}",

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("formatted_notification", "/notifications/{notification_id}.{format}",

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
    #ADMIN GIST

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/gists') as m:

			




	
	
	
		
 
        m.connect("gists", "/gists",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("gists", "/gists",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_gist", "/gists/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("/gists/{gist_id}",

			




	
	
	
		
 
                  action="update", conditions=dict(method=["PUT"]))

			




	
	
	
		
 
        m.connect("/gists/{gist_id}",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["DELETE"]))

			




	
	
	
		
 
        m.connect("edit_gist", "/gists/{gist_id}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET", "POST"]))

			




	
	
	
		
 
        m.connect("edit_gist_check_revision", "/gists/{gist_id}/edit/check_revision",

			




	
	
	
		
 
                  action="check_revision", conditions=dict(method=["POST"]))

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/notifications.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -69,84 +69,72 @@ class NotificationsController(BaseContro

			




	
	
	
		
 
                          Notification.TYPE_PULL_REQUEST_COMMENT]

			




	
	
	
		
 

			




	
	
	
		
 
        _current_filter = request.GET.getall('type')

			




	
	
	
		
 
        c.current_filter = 'all'

			




	
	
	
		
 
        if _current_filter == [c.pull_request_type]:

			




	
	
	
		
 
            c.current_filter = 'pull_request'

			




	
	
	
		
 
        elif _current_filter == c.comment_type:

			




	
	
	
		
 
            c.current_filter = 'comment'

			




	
	
	
		
 

			




	
	
	
		
 
        return render('admin/notifications/notifications.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def mark_all_read(self):

			




	
	
	
		
 
        if request.environ.get('HTTP_X_PARTIAL_XHR'):

			




	
	
	
		
 
            nm = NotificationModel()

			




	
	
	
		
 
            # mark all read

			




	
	
	
		
 
            nm.mark_all_read_for_user(self.authuser.user_id,

			




	
	
	
		
 
                                      filter_=request.GET.getall('type'))

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            c.user = self.authuser

			




	
	
	
		
 
            notif = nm.query_for_user(self.authuser.user_id,

			




	
	
	
		
 
                                      filter_=request.GET.getall('type'))

			




	
	
	
		
 
            c.notifications = Page(notif, page=1, items_per_page=10)

			




	
	
	
		
 
            return render('admin/notifications/notifications_data.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def create(self):

			




	
	
	
		
 
        """POST /_admin/notifications: Create a new item"""

			




	
	
	
		
 
        # url('notifications')

			




	
	
	
		
 

			




	
	
	
		
 
    def new(self, format='html'):

			




	
	
	
		
 
        """GET /_admin/notifications/new: Form to create a new item"""

			




	
	
	
		
 
        # url('new_notification')

			




	
	
	
		
 

			




	
	
	
		
 
    def update(self, notification_id):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            no = Notification.get(notification_id)

			




	
	
	
		
 
            owner = all(un.user.user_id == c.authuser.user_id

			




	
	
	
		
 
                        for un in no.notifications_to_users)

			




	
	
	
		
 
            if h.HasPermissionAny('hg.admin')() or owner:

			




	
	
	
		
 
                # deletes only notification2user

			




	
	
	
		
 
                NotificationModel().mark_read(c.authuser.user_id, no)

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                return 'ok'

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            Session().rollback()

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
        raise HTTPBadRequest()

			




	
	
	
		
 

			




	
	
	
		
 
    def delete(self, notification_id):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            no = Notification.get(notification_id)

			




	
	
	
		
 
            owner = any(un.user.user_id == c.authuser.user_id

			




	
	
	
		
 
                        for un in no.notifications_to_users)

			




	
	
	
		
 
            if h.HasPermissionAny('hg.admin')() or owner:

			




	
	
	
		
 
                # deletes only notification2user

			




	
	
	
		
 
                NotificationModel().delete(c.authuser.user_id, no)

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                return 'ok'

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            Session().rollback()

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
        raise HTTPBadRequest()

			




	
	
	
		
 

			




	
	
	
		
 
    def show(self, notification_id, format='html'):

			




	
	
	
		
 
        notification = Notification.get_or_404(notification_id)

			




	
	
	
		
 

			




	
	
	
		
 
        unotification = NotificationModel() \

			




	
	
	
		
 
            .get_user_notification(self.authuser.user_id, notification)

			




	
	
	
		
 

			




	
	
	
		
 
        # if this association to user is not valid, we don't want to show

			




	
	
	
		
 
        # this message

			




	
	
	
		
 
        if unotification is None:

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 

			




	
	
	
		
 
        if not unotification.read:

			




	
	
	
		
 
            unotification.mark_as_read()

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        c.notification = notification

			




	
	
	
		
 
        c.user = self.authuser

			




	
	
	
		
 
        return render('admin/notifications/show_notification.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def edit(self, notification_id, format='html'):

			




	
	
	
		
 
        """GET /_admin/notifications/id/edit: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_notification', notification_id=ID)

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/user_groups.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -205,52 +205,48 @@ class UserGroupsController(BaseControlle

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during update of user group %s') \

			




	
	
	
		
 
                    % request.POST.get('users_group_name'), category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_users_group', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def delete(self, id):

			




	
	
	
		
 
        usr_gr = UserGroup.get_or_404(id)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            UserGroupModel().delete(usr_gr)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Successfully deleted user group'), category='success')

			




	
	
	
		
 
        except UserGroupsAssignedException as e:

			




	
	
	
		
 
            h.flash(e, category='error')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during deletion of user group'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        raise HTTPFound(location=url('users_groups'))

			




	
	
	
		
 

			




	
	
	
		
 
    def show(self, id, format='html'):

			




	
	
	
		
 
        """GET /user_groups/id: Show a specific item"""

			




	
	
	
		
 
        # url('users_group', id=ID)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def edit(self, id, format='html'):

			




	
	
	
		
 
        c.user_group = UserGroup.get_or_404(id)

			




	
	
	
		
 
        c.active = 'settings'

			




	
	
	
		
 
        self.__load_data(id)

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = self.__load_defaults(id)

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/user_groups/user_group_edit.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def edit_perms(self, id):

			




	
	
	
		
 
        c.user_group = UserGroup.get_or_404(id)

			




	
	
	
		
 
        c.active = 'perms'

			




	
	
	
		
 

			




	
	
	
		
 
        repo_model = RepoModel()

			




	
	
	
		
 
        c.users_array = repo_model.get_users_js()

			




	
	
	
		
 
        c.user_groups_array = repo_model.get_user_groups_js()

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/users.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -181,53 +181,48 @@ class UsersController(BaseController):

			




	
	
	
		
 
                errors=e,

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during update of user %s') \

			




	
	
	
		
 
                    % form_result.get('username'), category='error')

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    def delete(self, id):

			




	
	
	
		
 
        usr = User.get_or_404(id)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            UserModel().delete(usr)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Successfully deleted user'), category='success')

			




	
	
	
		
 
        except (UserOwnsReposException, DefaultUserException) as e:

			




	
	
	
		
 
            h.flash(e, category='warning')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during deletion of user'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        raise HTTPFound(location=url('users'))

			




	
	
	
		
 

			




	
	
	
		
 
    def show(self, id, format='html'):

			




	
	
	
		
 
        """GET /users/id: Show a specific item"""

			




	
	
	
		
 
        # url('user', id=ID)

			




	
	
	
		
 
        User.get_or_404(-1)

			




	
	
	
		
 

			




	
	
	
		
 
    def _get_user_or_raise_if_default(self, id):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            return User.get_or_404(id, allow_default=False)

			




	
	
	
		
 
        except DefaultUserException:

			




	
	
	
		
 
            h.flash(_("The default user cannot be edited"), category='warning')

			




	
	
	
		
 
            raise HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
    def _render_edit_profile(self, user):

			




	
	
	
		
 
        c.user = user

			




	
	
	
		
 
        c.active = 'profile'

			




	
	
	
		
 
        c.perm_user = AuthUser(dbuser=user)

			




	
	
	
		
 
        c.ip_addr = self.ip_addr

			




	
	
	
		
 
        managed_fields = auth_modules.get_managed_fields(user)

			




	
	
	
		
 
        c.readonly = lambda n: 'readonly' if n in managed_fields else None

			




	
	
	
		
 
        return render('admin/users/user_edit.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def edit(self, id, format='html'):

			




	
	
	
		
 
        user = self._get_user_or_raise_if_default(id)

			




	
	
	
		
 
        defaults = user.get_dict()

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            self._render_edit_profile(user),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_admin_user_groups.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -181,39 +181,24 @@ class TestAdminUsersGroupsController(Tes

			




	
	
	
		
 
                    [ug.users_group_id, p2.permission_id],

			




	
	
	
		
 
                    [ug.users_group_id, p3.permission_id]])

			




	
	
	
		
 

			




	
	
	
		
 
        # DELETE !

			




	
	
	
		
 
        ug = UserGroup.get_by_group_name(users_group_name)

			




	
	
	
		
 
        ugid = ug.users_group_id

			




	
	
	
		
 
        response = self.app.post(url('users_group', id=ug.users_group_id),

			




	
	
	
		
 
            params={'_method': 'delete', '_authentication_token': self.authentication_token()})

			




	
	
	
		
 
        response = response.follow()

			




	
	
	
		
 
        gr = Session().query(UserGroup) \

			




	
	
	
		
 
                           .filter(UserGroup.users_group_name ==

			




	
	
	
		
 
                                   users_group_name).scalar()

			




	
	
	
		
 

			




	
	
	
		
 
        assert gr == None

			




	
	
	
		
 
        p = Permission.get_by_key('hg.fork.repository')

			




	
	
	
		
 
        perms = UserGroupToPerm.query() \

			




	
	
	
		
 
            .filter(UserGroupToPerm.users_group_id == ugid).all()

			




	
	
	
		
 
        perms = [[x.users_group_id,

			




	
	
	
		
 
                  x.permission_id, ] for x in perms]

			




	
	
	
		
 
        assert perms == []

			




	
	
	
		
 

			




	
	
	
		
 
    def test_delete_browser_fakeout(self):

			




	
	
	
		
 
        response = self.app.post(url('users_group', id=1),

			




	
	
	
		
 
                                 params=dict(_method='delete', _authentication_token=self.authentication_token()))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_show(self):

			




	
	
	
		
 
        response = self.app.get(url('users_group', id=1))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_edit(self):

			




	
	
	
		
 
        response = self.app.get(url('edit_users_group', id=1))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_assign_members(self):

			




	
	
	
		
 
        pass

			




	
	
	
		
 

			




	
	
	
		
 
    def test_add_create_permission(self):

			




	
	
	
		
 
        pass

			




	
	
	
		
 

			




	
	
	
		
 
    def test_revoke_members(self):

			




	
	
	
		
 
        pass

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_admin_users.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -236,51 +236,48 @@ class TestAdminUsersController(TestContr

			




	
	
	
		
 
        groupname = u'usergroup_fail'

			




	
	
	
		
 

			




	
	
	
		
 
        fixture.create_user(name=username)

			




	
	
	
		
 
        ug = fixture.create_user_group(name=groupname, cur_user=username)

			




	
	
	
		
 

			




	
	
	
		
 
        new_user = Session().query(User) \

			




	
	
	
		
 
            .filter(User.username == username).one()

			




	
	
	
		
 
        response = self.app.post(url('user', id=new_user.user_id),

			




	
	
	
		
 
            params={'_method': 'delete', '_authentication_token': self.authentication_token()})

			




	
	
	
		
 
        self.checkSessionFlash(response, 'User "%s" still '

			




	
	
	
		
 
                               'owns 1 user groups and cannot be removed. '

			




	
	
	
		
 
                               'Switch owners or remove those user groups: '

			




	
	
	
		
 
                               '%s' % (username, groupname))

			




	
	
	
		
 

			




	
	
	
		
 
        # TODO: why do this fail?

			




	
	
	
		
 
        #response = self.app.delete(url('delete_users_group', id=groupname))

			




	
	
	
		
 
        #self.checkSessionFlash(response, 'Removed user group %s' % groupname)

			




	
	
	
		
 

			




	
	
	
		
 
        fixture.destroy_user_group(ug.users_group_id)

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.post(url('user', id=new_user.user_id),

			




	
	
	
		
 
            params={'_method': 'delete', '_authentication_token': self.authentication_token()})

			




	
	
	
		
 
        self.checkSessionFlash(response, 'Successfully deleted user')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_show(self):

			




	
	
	
		
 
        response = self.app.get(url('user', id=1))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_edit(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        user = User.get_by_username(TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 
        response = self.app.get(url('edit_user', id=user.user_id))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_add_perm_create_repo(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        perm_none = Permission.get_by_key('hg.create.none')

			




	
	
	
		
 
        perm_create = Permission.get_by_key('hg.create.repository')

			




	
	
	
		
 

			




	
	
	
		
 
        user = UserModel().create_or_update(username='dummy', password='qwe',

			




	
	
	
		
 
                                            email='dummy', firstname=u'a',

			




	
	
	
		
 
                                            lastname=u'b')

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        uid = user.user_id

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            #User should have None permission on creation repository

			




	
	
	
		
 
            assert UserModel().has_perm(user, perm_none) == False

			




	
	
	
		
 
            assert UserModel().has_perm(user, perm_create) == False

			




	
	
	
		
 

			




	
	
	
		
 
            response = self.app.post(url('edit_user_perms', id=uid),

			




	
	
	
		
 
                                     params=dict(_method='put',

			




	
	
	
		
 
                                                 create_repo_perm=True,

			




        

    



    


    



    



      

      





    
    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.