Return-Path: 
 <allura-commits-return-540-apmail-incubator-allura-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 88520D8C3
	for <apmail-incubator-allura-commits-archive@minotaur.apache.org>;
 Tue, 30 Oct 2012 17:30:09 +0000 (UTC)
Received: (qmail 88535 invoked by uid 500); 30 Oct 2012 17:30:09 -0000
Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org
Received: (qmail 88490 invoked by uid 500); 30 Oct 2012 17:30:09 -0000
Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:allura-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:allura-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:allura-commits@incubator.apache.org>
List-Id: <allura-commits.incubator.apache.org>
Reply-To: allura-dev@incubator.apache.org
Delivered-To: mailing list allura-commits@incubator.apache.org
Received: (qmail 87217 invoked by uid 99); 30 Oct 2012 17:30:06 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2012 17:30:06 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 68DB550D16; Tue, 30 Oct 2012 17:30:06 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: johnsca@apache.org
To: allura-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [26/48] git commit: [#5077] ticket:191 add confirmation when removing
 developer
Message-Id: <20121030173006.68DB550D16@tyr.zones.apache.org>
Date: Tue, 30 Oct 2012 17:30:06 +0000 (UTC)

[#5077] ticket:191 add confirmation when removing developer


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/58f6af4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/58f6af4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/58f6af4e

Branch: refs/heads/cj/5005
Commit: 58f6af4ebccb5506b3ecd03f7b447cfe6b9b2f97
Parents: 30c0f47
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Wed Oct 17 18:10:36 2012 +0400
Committer: Dave Brondsema <dbrondsema@geek.net>
Committed: Mon Oct 22 17:09:10 2012 +0000

----------------------------------------------------------------------
 .../allura/ext/admin/templates/project_groups.html |    2 +-
 Allura/allura/public/nf/js/project_groups.js       |   29 ++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/58f6af4e/Allura/allura/ext/admin/templates/project_groups.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html
index de3a5eb..7617c0c 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -57,7 +57,7 @@
           {% for r in role.users_with_role() %}
           <li class="deleter" data-user="{{r.user.username}}">
             <b data-icon="{{g.icons['perm_delete'].char}}"
-               class="ico {{g.icons['perm_delete'].css}}"></b>
+               class="ico {{g.icons['perm_delete'].css}} deleter" data-user="{{r.user.username}}"></b>
             {{ r.user.display_name }} ({{r.user.username}})
           </li>
           {% endfor %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/58f6af4e/Allura/allura/public/nf/js/project_groups.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/project_groups.js b/Allura/allura/public/nf/js/project_groups.js
index 6ca9cd3..3ed0ee1 100644
--- a/Allura/allura/public/nf/js/project_groups.js
+++ b/Allura/allura/public/nf/js/project_groups.js
@@ -32,23 +32,24 @@ $(function() {
   });
   // remove user from group
   var delete_user = function(evt){
-    var user_holder = $(this);
-    var params = {'role_id': user_holder.closest('tr').data('group'),
+    var user_holder =  $(this).parent();
+    if(confirm("Are you sure you want to remove the user "+user_holder.data('user')+"?")){
+        var params = {'role_id': user_holder.closest('tr').data('group'),
                   'username': user_holder.data('user'),
                   '_session_id': cval};
-    var old_html = user_holder.html();
-    user_holder.html(spinner_img+' Removing...');
-    $.post('remove_user', params, function(data){
-      if(data.error){
-        flash(data.error, 'error');
-        user_holder.html(old_html);
-      }
-      else{
-        user_holder.slideUp('fast');
+        var old_html = user_holder.html();
+        user_holder.html(spinner_img+' Removing...');
+        $.post('remove_user', params, function(data){
+            if(data.error){
+            flash(data.error, 'error');
+            user_holder.html(old_html);
+        }
+            else{
+             user_holder.slideUp('fast');
       }
     });
-  };
-  $('#usergroup_admin li.deleter').click(delete_user);
+  }};
+  $('#usergroup_admin b.deleter').click(delete_user);
   // add user to group
   $('#usergroup_admin tr').delegate("form.add_user", "submit", function(evt){
     evt.preventDefault();
@@ -66,7 +67,7 @@ $(function() {
       else{
         holder.attr('data-user', data.username).addClass('deleter');
         holder.html(perm_delete_ico+' '+data.displayname);
-        holder.click(delete_user);
+        holder.children('b').click(delete_user);
       }
     });
   });