kallithea Changeset - afe7c5e63aaf

Changeset - afe7c5e63aaf

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 12 years ago 2013-06-29 21:36:01
marcin@python-works.com

UX: require confirmation of revoking permissions on
repos/user groups/repo groups. We don't want people to
click on this accidentally.

4 files changed with 23 insertions and 13 deletions:

rhodecode/templates/admin/repos/repo_edit_perms.html

rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html

rhodecode/templates/admin/users_groups/user_group_edit_perms.html

rhodecode/templates/base/root.html

0 comments (0 inline, 0 general)

rhodecode/templates/admin/repos/repo_edit_perms.html

➞

Show inline comments

@@ @@ -29,7 +29,7 @@ @@
             </td>
             <td>
               %if r2p.user.username !='default':
                 <span class="delete_icon action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}')">
+                <span class="delete_icon action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                 ${_('revoke')}
                 </span>
               %endif
@@ @@ -54,7 +54,7 @@ @@
                 %endif
             </td>
             <td>
                 <span class="delete_icon action_button" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}')">
+                <span class="delete_icon action_button" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">
                 ${_('revoke')}
                 </span>
             </td>
@@ @@ -86,9 +86,12 @@ @@
     </tr>
 </table>
 <script type="text/javascript">
 function ajaxActionRevoke(obj_id, obj_type, field_id) {
+function ajaxActionRevoke(obj_id, obj_type, field_id, obj_name) {
     url = "${h.url('delete_repo_perm_member',repo_name=c.repo_name)}";
     ajaxActionRevokePermission(url, obj_id, obj_type, field_id);
     var revoke_msg = _TM['Confirm to revoke permission for {0}: {1} ?'].format(obj_type.replace('_', ' '), obj_name);
     if (confirm(revoke_msg)){
         ajaxActionRevokePermission(url, obj_id, obj_type, field_id);
+    }
 };
 YUE.onDOMReady(function () {

rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html

➞

Show inline comments

@@ @@ -21,7 +21,7 @@ @@
             </td>
             <td>
               %if r2p.user.username !='default':
                 <span class="delete_icon action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}')">
+                <span class="delete_icon action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                 ${_('revoke')}
                 </span>
               %endif
@@ @@ -51,7 +51,7 @@ @@
                 <img class="perm-gravatar" src="${h.url('/images/icons/group.png')}"/>${g2p.users_group.users_group_name}
             </td>
             <td>
                 <span class="delete_icon action_button" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}')">
+                <span class="delete_icon action_button" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">
                 ${_('revoke')}
                 </span>
             </td>
@@ @@ -90,9 +90,12 @@ @@
     </tr>
 </table>
 <script type="text/javascript">
 function ajaxActionRevoke(obj_id, obj_type, field_id) {
+function ajaxActionRevoke(obj_id, obj_type, field_id, obj_name) {
     url = "${h.url('delete_repo_group_perm_member', group_name=c.repos_group.group_name)}";
     ajaxActionRevokePermission(url, obj_id, obj_type, field_id, {recursive:YUD.get('recursive').checked});
     var revoke_msg = _TM['Confirm to revoke permission for {0}: {1} ?'].format(obj_type.replace('_', ' '), obj_name);
     if (confirm(revoke_msg)){
         ajaxActionRevokePermission(url, obj_id, obj_type, field_id, {recursive:YUD.get('recursive').checked});
+    }
 };
 YUE.onDOMReady(function () {

rhodecode/templates/admin/users_groups/user_group_edit_perms.html

➞

Show inline comments

@@ @@ -21,7 +21,7 @@ @@
             </td>
             <td>
               %if r2p.user.username !='default':
                 <span class="delete_icon action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}')">
+                <span class="delete_icon action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                 ${_('revoke')}
                 </span>
               %endif
@@ @@ -51,7 +51,7 @@ @@
                 <img class="perm-gravatar" src="${h.url('/images/icons/group.png')}"/>${g2p.user_group.users_group_name}
             </td>
             <td>
                 <span class="delete_icon action_button" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}')">
+                <span class="delete_icon action_button" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')">
                 ${_('revoke')}
                 </span>
             </td>
@@ @@ -84,9 +84,12 @@ @@
     </tr>
 </table>
 <script type="text/javascript">
 function ajaxActionRevoke(obj_id, obj_type, field_id) {
+function ajaxActionRevoke(obj_id, obj_type, field_id, obj_name) {
     url = "${h.url('delete_user_group_perm_member', id=c.users_group.users_group_id)}";
     ajaxActionRevokePermission(url, obj_id, obj_type, field_id);
     var revoke_msg = _TM['Confirm to revoke permission for {0}: {1} ?'].format(obj_type.replace('_', ' '), obj_name);
     if (confirm(revoke_msg)){
         ajaxActionRevokePermission(url, obj_id, obj_type, field_id);
+    }
 };
 YUE.onDOMReady(function () {

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -57,7 +57,8 @@ @@
                 'Selection link': "${_('Selection link')}",
                 'Collapse diff': "${_('Collapse diff')}",
                 'Expand diff': "${_('Expand diff')}",
                 'Failed to revoke permission': "${_('Failed to revoke permission')}"
                 'Failed to revoke permission': "${_('Failed to revoke permission')}",
                 'Confirm to revoke permission for {0}: {1} ?': "${_('confirm to revoke permission for {0}: {1} ?')}",
             };
             var _TM = TRANSLATION_MAP;

0 comments (0 inline, 0 general)