From f7add8444d3fa93e327bede5995016eaa1d2a127 Mon Sep 17 00:00:00 2001
From: Alvaro Campos <alvaro@colosa.com>
Date: Wed, 9 Nov 2011 11:28:06 -0400
Subject: [PATCH] BUG 7554 A new permission was added for the functionality of
 "Cancel"

---
 workflow/engine/methods/cases/ajaxListener.php | 15 ++++++++-------
 workflow/engine/templates/cases/open.js        | 14 ++++++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php
index 154e1813d..8d2dfe394 100755
--- a/workflow/engine/methods/cases/ajaxListener.php
+++ b/workflow/engine/methods/cases/ajaxListener.php
@@ -281,16 +281,17 @@ $caseStep->getStepPosition());
       break;
 
       case 'TO_DO':
-          if( ! AppDelay::isPaused($_SESSION['APPLICATION'], $_SESSION['INDEX']) ) {
-            $options[] = Array('text'=>G::LoadTranslation('ID_PAUSED_CASE'), 'fn'=>'setUnpauseCaseDate');
-
-            if ($cant == 1) {
+        if( ! AppDelay::isPaused($_SESSION['APPLICATION'], $_SESSION['INDEX']) ) {
+          $options[] = Array('text'=>G::LoadTranslation('ID_PAUSED_CASE'), 'fn'=>'setUnpauseCaseDate');
+          if ($cant == 1) {                        
+            if($RBAC->userCanAccess('PM_CANCELCASE')==1) 
               $options[] = Array('text'=>G::LoadTranslation('ID_CANCEL'), 'fn'=>'cancelCase');
+            else  
+              $options[] = Array('text'=>G::LoadTranslation('ID_CANCEL'), 'fn'=>'cancelCase', 'hide'=>'hiden');            	            	            
             }
           } else {
-            $options[] = Array('text'=>G::LoadTranslation('ID_UNPAUSE'), 'fn'=>'unpauseCase');
-          }
-
+              $options[] = Array('text'=>G::LoadTranslation('ID_UNPAUSE'), 'fn'=>'unpauseCase');
+            }
           if($RBAC->userCanAccess('PM_REASSIGNCASE')==1) {
             $options[] = Array('text'=>G::LoadTranslation('ID_REASSIGN'), 'fn'=>'getUsersToReassign');
           }
diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js
index a9bafedcf..5ca99ca47 100755
--- a/workflow/engine/templates/cases/open.js
+++ b/workflow/engine/templates/cases/open.js
@@ -64,7 +64,7 @@ Ext.onReady(function(){
       url : 'ajaxListener',
       params : {action : 'getCaseMenu', app_status:app_status},
       success: function ( result, request ) {
-        var data = Ext.util.JSON.decode(result.responseText);
+        var data = Ext.util.JSON.decode(result.responseText);        
         for(i=0; i<data.length; i++) {
           switch(data[i].id) {
             case 'STEPS':
@@ -93,11 +93,13 @@ Ext.onReady(function(){
               var actionMenu = Ext.getCmp('actionMenu');
               actionMenu.menu.removeAll();
               for(j=0; j<data[i].options.length; j++) {
-                actionMenu.menu.add({
-                  text: data[i].options[j].text,
-                  handler: data[i].options[j].fn != '' ? Actions[data[i].options[j].fn] : function(){}
-                });
-                menuSelectedTitle[data[i].options[j].fn] = data[i].options[j].text;
+            	if(!data[i].options[j].hide){
+                  actionMenu.menu.add({
+                    text: data[i].options[j].text,
+                    handler: data[i].options[j].fn != '' ? Actions[data[i].options[j].fn] : function(){}
+                  });
+                  menuSelectedTitle[data[i].options[j].fn] = data[i].options[j].text;
+                }
               }
               actionMenu.show();
               break;