diff --git a/rhodecode/templates/admin/users/user_edit_advanced.mako b/rhodecode/templates/admin/users/user_edit_advanced.mako --- a/rhodecode/templates/admin/users/user_edit_advanced.mako +++ b/rhodecode/templates/admin/users/user_edit_advanced.mako @@ -96,20 +96,16 @@
${h.secure_form(h.route_path('user_delete', user_id=c.user.user_id), request=request)} - +
@@ -118,14 +114,10 @@ ${_ungettext('This user owns %s repository group.', 'This user owns %s repository groups.', len(c.user.repository_groups)) % len(c.user.repository_groups)} @@ -134,18 +126,37 @@ ${_ungettext('This user owns %s user group.', 'This user owns %s user groups.', len(c.user.user_groups)) % len(c.user.user_groups)}
${_ungettext('This user owns %s repository.', 'This user owns %s repositories.', len(c.user.repositories)) % len(c.user.repositories)} - %if len(c.user.repositories) > 0: - - %endif + - %if len(c.user.repositories) > 0: - - %endif +
- %if len(c.user.repository_groups) > 0: - - %endif + - %if len(c.user.repository_groups) > 0: - - %endif +
- %if len(c.user.user_groups) > 0: - - %endif + - %if len(c.user.user_groups) > 0: - - %endif +
+
+ % if len(c.user.repositories) > 0 or len(c.user.repository_groups) > 0 or len(c.user.user_groups) > 0: + % endif + + ${_('New owner for detached objects')}: +
${base.gravatar_with_user(c.first_admin.email, 16)}
+
+
+ +
+

+ ${_("When selecting the detach option, the depending objects owned by this user will be assigned to the above user.")} +
+ ${_("The delete option will delete the user and all his owned objects!")} +

+
+ + % if c.can_delete_user_message: +

${c.can_delete_user_message}

+ % endif +
+ +
- % if c.can_delete_user_message: -

${c.can_delete_user_message}

- % endif - -
- - %if len(c.user.repositories) > 0 or len(c.user.repository_groups) > 0 or len(c.user.user_groups) > 0: -

${_("When selecting the detach option, the depending objects owned by this user will be assigned to the `%s` super admin in the system. The delete option will delete the user's repositories!") % (c.first_admin.full_name)}

- %endif -
-
${h.end_form()}