[otrs-cvs] otrs/var/httpd/htdocs/js Core.Agent.Admin.ProcessManagement.js, 1.63, 1.64 Core.Agent.Admin.ProcessManagement.Canvas.js, 1.44, 1.45

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

Modified Files:
	Core.Agent.Admin.ProcessManagement.js 
	Core.Agent.Admin.ProcessManagement.Canvas.js 
Log Message:
Followup to bug#9044 - ProcessManagement: Transition is duplicated on redraw. If a transition action was used twice in a process, both shared the same transition actions. Opening the path popup did not show the correct transition information.

Author: mn

Index: Core.Agent.Admin.ProcessManagement.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/Core.Agent.Admin.ProcessManagement.js,v
retrieving revision 1.63
retrieving revision 1.64
diff -2 -u -d -r1.63 -r1.64
--- Core.Agent.Admin.ProcessManagement.js	14 Jan 2013 14:40:16 -0000	1.63
+++ Core.Agent.Admin.ProcessManagement.js	21 Jan 2013 10:32:04 -0000	1.64
@@ -1067,4 +1067,5 @@
         var CurrentProcessEntityID = Core.Config.Get('Config.ProcessEntityID'),
             CurrentTransitionEntityID = Core.Config.Get('Config.TransitionEntityID'),
+            StartActivityID = Core.Config.Get('Config.StartActivityID'),
             ActivityInfo = window.opener.Core.Agent.Admin.ProcessManagement.ProcessData.Activity,
             PathInfo = window.opener.Core.Agent.Admin.ProcessManagement.ProcessData.Process[CurrentProcessEntityID].Path,
@@ -1080,6 +1081,5 @@
         // set current start and end activity (just for information purposes, not changeable)
         $.each(PathInfo, function(Activity, Transition) {
-           if ( Transition[CurrentTransitionEntityID] !== undefined ) {
-
+            if (Activity === StartActivityID && typeof Transition[CurrentTransitionEntityID] !== 'undefined') {
                 $('#StartActivity').text(ActivityInfo[Activity].Name);
                 $('#EndActivity').text(ActivityInfo[Transition[CurrentTransitionEntityID].ActivityEntityID].Name);
@@ -1090,5 +1090,5 @@
 
                 return false;
-           }
+            }
         });
 

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.44
retrieving revision 1.45
diff -2 -u -d -r1.44 -r1.45
--- Core.Agent.Admin.ProcessManagement.Canvas.js	14 Jan 2013 16:40:10 -0000	1.44
+++ Core.Agent.Admin.ProcessManagement.Canvas.js	21 Jan 2013 10:32:04 -0000	1.45
@@ -147,5 +147,5 @@
     };
 
-    TargetNS.ShowTransitionTooltip = function (Connection) {
+    TargetNS.ShowTransitionTooltip = function (Connection, StartActivity, EndActivity) {
         var $tooltip = $('#DiagramTooltip'),
             $Element = $(Connection.canvas),
@@ -181,5 +181,5 @@
 
         $.each(PathInfo, function(Activity, Transition) {
-            if ( Transition[ElementID] !== undefined ) {
+            if (Activity === StartActivity && typeof Transition[ElementID] !== 'undefined' && typeof Transition[ElementID].TransitionAction !== 'undefined') {
                 AssignedTransitionActions = Transition[ElementID].TransitionAction;
                 return false;
@@ -189,5 +189,5 @@
         // Add content to the tooltip
         text += "<ul>";
-        if (AssignedTransitionActions) {
+        if (AssignedTransitionActions.length) {
             $.each(AssignedTransitionActions, function (Key, Value) {
                 text += "<li>" + Core.Agent.Admin.ProcessManagement.ProcessData.TransitionAction[Value].Name + " (" + Value + ") </li>";
@@ -454,5 +454,5 @@
                 [ "Label", { label: TransitionName, location: 0.5, cssClass: 'TransitionLabel', id: EntityID, events: {
                     mouseenter: function(labelOverlay, originalEvent) {
-                        TargetNS.HighlightTransitionLabel(labelOverlay);
+                        TargetNS.HighlightTransitionLabel(labelOverlay, StartElement, EndElement);
                         originalEvent.stopPropagation();
                         return false;
@@ -471,5 +471,5 @@
     };
 
-    TargetNS.HighlightTransitionLabel = function(Connection) {
+    TargetNS.HighlightTransitionLabel = function(Connection, StartActivity, EndActivity) {
 
         var Config = Core.Agent.Admin.ProcessManagement.ProcessData,
@@ -477,6 +477,6 @@
             Path = Config.Process[ProcessEntityID].Path,
             TransitionEntityID = Connection.id,
-            PopupPath = Core.Config.Get('Config.PopupPathPath') + "ProcessEntityID=" + ProcessEntityID + ";TransitionEntityID=" + TransitionEntityID,
             StartActivityID = Connection.component.sourceId,
+            PopupPath = Core.Config.Get('Config.PopupPathPath') + "ProcessEntityID=" + ProcessEntityID + ";TransitionEntityID=" + TransitionEntityID + ";StartActivityID=" + StartActivityID,
             Transition;
 
@@ -502,9 +502,11 @@
 
         // show tooltip with assigned transition actions
-        TargetNS.ShowTransitionTooltip(Connection);
+        TargetNS.ShowTransitionTooltip(Connection, StartActivity, EndActivity);
 
         $(Connection.canvas).unbind('dblclick.Transition').bind('dblclick.Transition', function(Event) {
-            Core.Agent.Admin.ProcessManagement.ShowOverlay();
-            Core.UI.Popup.OpenPopup(PopupPath, 'Path');
+            if (EndActivity !== 'Dummy') {
+                Core.Agent.Admin.ProcessManagement.ShowOverlay();
+                Core.UI.Popup.OpenPopup(PopupPath, 'Path');
+            }
             Event.stopPropagation();
             return false;
@@ -698,5 +700,5 @@
                 Data.connection.addOverlay([ "Label", { label: TransitionName, location: 0.5, cssClass: 'TransitionLabel', id: TransitionID, events: {
                     mouseenter: function(labelOverlay, originalEvent) {
-                        TargetNS.HighlightTransitionLabel(labelOverlay);
+                        TargetNS.HighlightTransitionLabel(labelOverlay, Data.sourceId, Data.targetId);
                     },
                     mouseexit: function(labelOverlay, originalEvent) {
---------------------------------------------------------------------
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