[otrs-cvs] otrs/var/httpd/htdocs/js Core.Agent.Admin.ProcessManagement.Canvas.js, 1.47, 1.48

Comments:
Update of /home/cvs/otrs/var/httpd/htdocs/js
In directory lancelot:/tmp/cvs-serv823/var/httpd/htdocs/js

Modified Files:
	Core.Agent.Admin.ProcessManagement.Canvas.js 
Log Message:
Fixed bug#9068 - ProcessManagement: Entity Names not shown in Deletion Dialogs.

Author: mn

Index: Core.Agent.Admin.ProcessManagement.Canvas.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/Core.Agent.Admin.ProcessManagement.Canvas.js,v
retrieving revision 1.47
retrieving revision 1.48
diff -2 -u -d -r1.47 -r1.48
--- Core.Agent.Admin.ProcessManagement.Canvas.js	28 Jan 2013 13:21:31 -0000	1.47
+++ Core.Agent.Admin.ProcessManagement.Canvas.js	5 Feb 2013 13:09:24 -0000	1.48
@@ -88,4 +88,37 @@
     }
 
+    function ShowRemoveEntityCanvasConfirmationDialog(EntityType, EntityName, EntityID, Callback) {
+        var DialogID = 'Remove' + EntityType + 'CanvasConfirmationDialog',
+            $DialogElement = $('#Dialogs #' + DialogID);
+
+        // Update EntityName in Dialog
+        $DialogElement.find('span.EntityName').text(EntityName);
+
+        Core.UI.Dialog.ShowContentDialog(
+            $('#Dialogs #' + DialogID),
+            Core.Agent.Admin.ProcessManagement.Localization.RemoveEntityCanvasTitle,
+            '240px',
+            'Center',
+            true,
+            [
+               {
+                   Label: Core.Agent.Admin.ProcessManagement.Localization.CancelMsg,
+                   Class: 'Primary',
+                   Function: function () {
+                       Core.UI.Dialog.CloseDialog($('.Dialog'));
+                   }
+               },
+               {
+                   Label: Core.Agent.Admin.ProcessManagement.Localization.DeleteMsg,
+                   Function: function () {
+                       if (typeof(Callback) !== 'undefined') {
+                           Callback();
+                       }
+                   }
+               }
+           ]
+        );
+    }
+
     TargetNS.CreateStartEvent = function (PosX, PosY) {
         var DefaultX = 30,
@@ -292,8 +325,8 @@
             .unbind('click')
             .bind('click', function () {
-                var Remove = confirm(Core.Agent.Admin.ProcessManagement.Localization.RemoveActivityMsg);
-                if (Remove) {
+                ShowRemoveEntityCanvasConfirmationDialog('Activity', Activity[ElementID].Name, ElementID, function () {
                     TargetNS.RemoveActivity(ElementID);
-                }
+                    Core.UI.Dialog.CloseDialog($('.Dialog'));
+                });
                 return false;
             });
@@ -501,8 +534,10 @@
         if (!$(Connection.canvas).find('.Delete').length) {
             $(Connection.canvas).append('<a class="Delete" href="#">x</a>').find('.Delete').bind('click', function(Event) {
-                if (window.confirm(Core.Agent.Admin.ProcessManagement.Localization.RemoveTransitionMsg)) {
+                ShowRemoveEntityCanvasConfirmationDialog('Path', Config.Transition[TransitionEntityID].Name, TransitionEntityID, function () {
                     jsPlumb.detach(Connection.component);
                     delete Path[StartActivityID][TransitionEntityID];
-                }
+                    Core.UI.Dialog.CloseDialog($('.Dialog'));
+                });
+
                 Event.stopPropagation();
                 return false;
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log