diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index b270d73da..cf2870d92 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -220,7 +220,7 @@ try { $oHeadPublisher = & headPublisher::getSingleton(); - if(!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) { + if (!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) { $oHeadPublisher->addScriptCode( " if (typeof parent != 'undefined') { if (parent.setNode) { @@ -1000,7 +1000,7 @@ try { $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addScriptFile( "/jscore/cases/core/cases_Step.js" ); -if(!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) { +if (!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) { $oHeadPublisher->addScriptCode( " if (typeof parent != 'undefined') { if (parent.showCaseNavigatorPanel) { diff --git a/workflow/engine/xmlform/dynaforms/fields/currency.xml b/workflow/engine/xmlform/dynaforms/fields/currency.xml index b36640c95..f23a0faee 100755 --- a/workflow/engine/xmlform/dynaforms/fields/currency.xml +++ b/workflow/engine/xmlform/dynaforms/fields/currency.xml @@ -70,14 +70,13 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME Operations - + Formula Function - Data @@ -126,7 +125,7 @@ if(dyntype != 'grid'){ //hideRowById('PME_FORMULA'); hideRowById('PME_FUNCTION'); } - + function cancel(){ currentPopupWindow.remove(); } diff --git a/workflow/engine/xmlform/dynaforms/fields/percentage.xml b/workflow/engine/xmlform/dynaforms/fields/percentage.xml index 27a7ba2df..9b0c0687b 100755 --- a/workflow/engine/xmlform/dynaforms/fields/percentage.xml +++ b/workflow/engine/xmlform/dynaforms/fields/percentage.xml @@ -69,13 +69,10 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME Mode - - - Operations - + Formula @@ -117,15 +114,15 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME leimnud.event.add(fieldVal, 'change', {method:checkVal, instance:fieldVal, event:true}); leimnud.event.add(fieldMask, 'change', {method:checkVal, instance:fieldMask, event:true}); leimnud.event.add(fieldSeparator, 'change', {method:checkSeparator, instance:fieldSeparator, event:true}); - + var dyntype="@#PME_DYN_TYPE"; - + if(dyntype != 'grid'){ //hideRowById('PME_SUBTITLE_OP'); //hideRowById('PME_FORMULA'); hideRowById('PME_FUNCTION'); } - + function cancel(){ currentPopupWindow.remove(); } diff --git a/workflow/engine/xmlform/dynaforms/fields/text.xml b/workflow/engine/xmlform/dynaforms/fields/text.xml index 0d493c11c..38de3dc8a 100755 --- a/workflow/engine/xmlform/dynaforms/fields/text.xml +++ b/workflow/engine/xmlform/dynaforms/fields/text.xml @@ -72,7 +72,7 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@ Operations - + Formula @@ -102,15 +102,15 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@ - +