From aeb2aef494c180663549d8a37fe1fa824556805b Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Mon, 30 May 2011 12:54:33 -0400 Subject: [PATCH] BUG 6970 "Case Options" SOLVED Now we can add more option on case menu setting up the menu "caseOptions" --- workflow/engine/methods/cases/ajaxListener.php | 2 +- workflow/engine/methods/cases/open.php | 2 ++ workflow/engine/templates/cases/open.js | 18 +++++++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index 691474ae1..827e6ca0f 100755 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -61,7 +61,7 @@ class Ajax $option = Array( 'id' => $oMenu->Id[$i], 'label' => $oMenu->Labels[$i], - 'action' => ($action!='STEPS' && $action!='ACTIONS' && $action!='INFO') ? $action : '' + 'action' => $action ); switch($option['id']) { diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php index 3510e7ed0..41bf6cad8 100755 --- a/workflow/engine/methods/cases/open.php +++ b/workflow/engine/methods/cases/open.php @@ -63,6 +63,8 @@ $oHeadPublisher->assign('uri', $script . $uri); $oHeadPublisher->assign('_APP_NUM', $appNum); $oHeadPublisher->assign('_ENV_CURRENT_DATE', $conf->getSystemDate(date('Y-m-d'))); + $oHeadPublisher->assign('_ENV_CURRENT_DATE_NO_FORMAT', date('Y-m-d')); + G::RenderPage('publish', 'extJs'); diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index a4d6e1c85..b79eddb36 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -99,6 +99,22 @@ Ext.onReady(function(){ } actionMenu.show(); break; + + // custom menus from plugins or others + default: + var navPanel = Ext.getCmp('navPanel'); + var tb = navPanel.getTopToolbar(); + + var menu = new Ext.Action({ + id: data[i].id, + text: data[i].label, + handler: function(){ + eval(this._action); + }, + _action: data[i].action.replace('javascript:', '').replace(';', '') + }); + + tb.add(menu); } } }, @@ -514,7 +530,7 @@ Ext.onReady(function(){ Actions.setUnpauseCaseDate = function() { - curDate = _ENV_CURRENT_DATE.split('-'); + curDate = _ENV_CURRENT_DATE_NO_FORMAT.split('-'); filterDate = curDate[0]+'-'+curDate[1]+'-'; nDay = '' + (parseInt(curDate[2])+1); nDay = nDay.length == 1 ? '0' + nDay : nDay;