Merge pull request #6528 from miguelvazq/HPCC-12234

HPCC-12234 - Should warn if admin is removed Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com> Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
hpcc-systems · Nov 3, 2014 · cedce94 · cedce94
2 parents 4aa66e7 + c574669
commit cedce94
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/esp/src/eclwatch/MemberOfWidget.js b/esp/src/eclwatch/MemberOfWidget.js
@@ -25,17 +25,19 @@ define([
 
     "hpcc/GridDetailsWidget",
     "hpcc/ws_access",
+    "hpcc/ws_account",
     "hpcc/ESPUtil"
 
 ], function (declare, lang, i18n, nlsHPCC,
                 registry,
                 editor,
-                GridDetailsWidget, WsAccess, ESPUtil) {
+                GridDetailsWidget, WsAccess, WsAccount, ESPUtil) {
     return declare("MemberOfWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 
         gridTitle: nlsHPCC.title_MemberOf,
         idProperty: "__hpcc_id",
+        currentUser: null,
 
         //  Hitched Actions  ---
         _onRefresh: function (args) {
@@ -44,11 +46,27 @@ define([
 
         //  Implementation  ---
         init: function (params) {
+            var context = this;
             if (this.inherited(arguments))
                 return;
 
+            WsAccount.MyAccount({
+            }).then(function (response) {
+                if (lang.exists("MyAccountResponse.username", response)) {
+                    context.currentUser = response.MyAccountResponse.username;
+                }
+            });
+
             this.store = WsAccess.CreateGroupsStore(params.username, false);
             this.grid.setStore(this.store);
+            this.grid.on("dgrid-datachange", function(event){
+                if (dojoConfig.isAdmin && params.username === context.currentUser && event.oldValue === true) {
+                    var msg = confirm(context.i18n.RemoveUser + " " + event.rowId + ". " + context.i18n.ConfirmRemoval);
+                    if (!msg){
+                        event.preventDefault();
+                    }
+                }
+            });
             this._refreshActionState();
         },
 

diff --git a/esp/src/eclwatch/nls/es/hpcc.js b/esp/src/eclwatch/nls/es/hpcc.js
@@ -65,6 +65,7 @@ define(
     Compressed: "Comprimido",
     Configuration: "Configuracion",
     ConfirmPassword: "Confirme la Contraseña",
+    ConfirmRemoval: "¿Seguro que quieres hacer esto?",
     Content: "Contenido",
     Contents: "Contenidos",
     ContentType: "Tipo de Contenido",
@@ -359,6 +360,7 @@ define(
     RemoteDali: "Dali remoto",
     RemoteDaliIP: "Remote&nbsp;Dali&nbsp;IP&nbsp;Address",
     Remove: "Remover",
+    RemoveUser: "Esta apunto de excluirse del grupo:",
     Rename: "Renombrar",
     RenderedSVG: "SVG creado",
     RenderSVG: "Crear SVG",

diff --git a/esp/src/eclwatch/nls/hpcc.js b/esp/src/eclwatch/nls/hpcc.js
@@ -62,6 +62,7 @@ define({root:
     Compressed: "Compressed",
     Configuration: "Configuration",
     ConfirmPassword: "Confirm Password",
+    ConfirmRemoval: "Are you sure you want to do this?",
     Content: "Content",
     Contents: "Contents",
     ContentType: "Content Type",
@@ -363,6 +364,7 @@ define({root:
     RemoteDali: "Remote Dali",
     RemoteDaliIP: "Remote Dali IP Address",
     Remove: "Remove",
+    RemoveUser: "You are about to remove yourself from the group:",
     Rename: "Rename",
     RenderedSVG: "Rendered SVG",
     RenderSVG: "Render SVG",