diff --git a/workflow/engine/methods/bpmn/designer.php b/workflow/engine/methods/bpmn/designer.php index 6638f0b88..c3fe6af05 100755 --- a/workflow/engine/methods/bpmn/designer.php +++ b/workflow/engine/methods/bpmn/designer.php @@ -2,7 +2,6 @@ $oHeadPublisher =& headPublisher::getSingleton(); //$oHeadPublisher->setExtSkin( 'xtheme-gray'); -/* $oHeadPublisher->addExtJsScript('bpmn/MyWorkflow',true ); //adding a javascript file .js $oHeadPublisher->addExtJsScript('bpmn/pmosExt', true ); //adding a javascript file .js $oHeadPublisher->addExtJsScript('bpmn/TaskContext', true ); //adding a javascript file .js @@ -52,8 +51,7 @@ $oHeadPublisher->addExtJsScript('bpmn/GatewayComplex' ); $oHeadPublisher->addExtJsScript('bpmn/GridPanel'); $oHeadPublisher->addExtJsScript('bpmn/SubProcess' ); - $oHeadPublisher->addExtJsScript('bpmn/ProcessOptions',true); -*/ + $oHeadPublisher->addContent( 'bpmn/designer'); //adding a html file .html. $oHeadPublisher->assign('pro_uid', (isset($_GET['PRO_UID']) ? $_GET['PRO_UID']: '')); G::RenderPage('publish', 'extJs'); diff --git a/workflow/engine/methods/bpmn/processmap.php b/workflow/engine/methods/bpmn/processmap.php index a38ad31ec..320344370 100755 --- a/workflow/engine/methods/bpmn/processmap.php +++ b/workflow/engine/methods/bpmn/processmap.php @@ -15,65 +15,15 @@ $_SESSION['PROCESSMAP'] = 'BPMN'; $oHeadPublisher =& headPublisher::getSingleton(); - //$oHeadPublisher->usingExtJs('ux/miframe'); + $oHeadPublisher->usingExtJs('ux/miframe'); //$oHeadPublisher->setExtSkin( 'xtheme-gray'); - $oHeadPublisher->addExtJsScript('bpmn/MyWorkflow',true ); - $oHeadPublisher->addExtJsScript('bpmn/pmosExt', true ); - $oHeadPublisher->addExtJsScript('bpmn/TaskContext', true ); - $oHeadPublisher->addExtJsScript('bpmn/ProcessMapContext', false ); - $oHeadPublisher->addExtJsScript('bpmn/processmap', true ); - $oHeadPublisher->addExtJsScript('bpmn/designer', true ); - $oHeadPublisher->addExtJsScript('bpmn/Annotation', true ); - $oHeadPublisher->addExtJsScript('bpmn/bpmnShapes', true); - //$oHeadPublisher->addExtJsScript('bpmn/LoopingSubProcess'); - //$oHeadPublisher->addExtJsScript('bpmn/LoopingTask'); // - //$oHeadPublisher->addExtJsScript('bpmn/Dataobject'); // - $oHeadPublisher->addExtJsScript('bpmn/Pool',true); - $oHeadPublisher->addExtJsScript('bpmn/Lane'); - - - - $oHeadPublisher->addExtJsScript('bpmn/EventEmptyStart'); - $oHeadPublisher->addExtJsScript('bpmn/EventMessageStart'); - //$oHeadPublisher->addExtJsScript('bpmn/EventRuleStart'); - $oHeadPublisher->addExtJsScript('bpmn/EventTimerStart'); - //$oHeadPublisher->addExtJsScript('bpmn/EventSignalStart'); - //$oHeadPublisher->addExtJsScript('bpmn/EventMulStart'); - //$oHeadPublisher->addExtJsScript('bpmn/EventLinkStart'); - $oHeadPublisher->addExtJsScript('bpmn/EventEmptyInter'); - $oHeadPublisher->addExtJsScript('bpmn/EventMessageRecInter'); - $oHeadPublisher->addExtJsScript('bpmn/EventMessageSendInter'); - $oHeadPublisher->addExtJsScript('bpmn/EventTimerInter'); - //$oHeadPublisher->addExtJsScript('bpmn/EventBoundaryTimerInter'); - //$oHeadPublisher->addExtJsScript('bpmn/EventErrorInter'); - //$oHeadPublisher->addExtJsScript('bpmn/EventCompInter'); - //$oHeadPublisher->addExtJsScript('bpmn/EventRuleInter'); - //$oHeadPublisher->addExtJsScript('bpmn/EventCancelInter'); - //$oHeadPublisher->addExtJsScript('bpmn/EventInterSignal'); - //$oHeadPublisher->addExtJsScript('bpmn/EventMultipleInter'); - //$oHeadPublisher->addExtJsScript('bpmn/EventLinkInter'); - $oHeadPublisher->addExtJsScript('bpmn/EventEmptyEnd'); - $oHeadPublisher->addExtJsScript('bpmn/EventMessageEnd'); - //$oHeadPublisher->addExtJsScript('bpmn/EventErrorEnd'); - //$oHeadPublisher->addExtJsScript('bpmn/EventCompEnd'); - $oHeadPublisher->addExtJsScript('bpmn/EventTerminateEnd'); - //$oHeadPublisher->addExtJsScript('bpmn/EventEndSignal'); - //$oHeadPublisher->addExtJsScript('bpmn/EventMultipleEnd'); - //$oHeadPublisher->addExtJsScript('bpmn/EventCancelEnd'); - //$oHeadPublisher->addExtJsScript('bpmn/EventLinkEnd'); - - $oHeadPublisher->addExtJsScript('bpmn/GatewayInclusive' ); - $oHeadPublisher->addExtJsScript('bpmn/GatewayExclusiveData' ); - $oHeadPublisher->addExtJsScript('bpmn/GatewayExclusiveEvent' ); - $oHeadPublisher->addExtJsScript('bpmn/GatewayParallel' ); - //$oHeadPublisher->addExtJsScript('bpmn/GatewayComplex' ); - $oHeadPublisher->addExtJsScript('bpmn/GridPanel'); - $oHeadPublisher->addExtJsScript('bpmn/SubProcess' ); + $oHeadPublisher->addExtJsScript('bpmn/processmap', true ); //adding a javascript file .js $oHeadPublisher->addExtJsScript('bpmn/ProcessOptions',true); $oHeadPublisher->addContent( 'bpmn/processmap'); //adding a html file .html. - + + $oHeadPublisher->assign('pro_title', $process->getProTitle()); $oHeadPublisher->assign('pro_uid', $process->getProUid()); G::RenderPage('publish', 'extJs');