From 29eaea60f6fdea01fa59b6982b87c20f7c5ab26b Mon Sep 17 00:00:00 2001 From: Brayan Pereyra Date: Fri, 8 May 2015 15:41:43 -0400 Subject: [PATCH] PM-2660 Adicion del permiso Summary Form --- workflow/engine/controllers/designer.php | 3 +++ workflow/engine/methods/cases/summary.php | 26 ++++++++++++++----- .../Api/Project/ProcessPermissions.php | 2 +- workflow/engine/templates/designer/index.html | 2 ++ 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php index 745d5c771..e1afc7ca0 100644 --- a/workflow/engine/controllers/designer.php +++ b/workflow/engine/controllers/designer.php @@ -55,16 +55,19 @@ class Designer extends Controller $clientToken["client_secret"] = $client['CLIENT_SECRET']; $consolidated = 0; + $enterprise = 0; /*----------------------------------********---------------------------------*/ $licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) { $consolidated = 1; } + $enterprise = 1; /*----------------------------------********---------------------------------*/ $this->setVar('prj_uid', $proUid); $this->setVar('app_uid', $appUid); $this->setVar('consolidated', $consolidated); + $this->setVar('enterprise', $enterprise); $this->setVar('prj_readonly', $proReadOnly); $this->setVar('credentials', base64_encode(json_encode($clientToken))); $this->setVar('isDebugMode', $debug); diff --git a/workflow/engine/methods/cases/summary.php b/workflow/engine/methods/cases/summary.php index 1975b4bb7..72be7a59c 100755 --- a/workflow/engine/methods/cases/summary.php +++ b/workflow/engine/methods/cases/summary.php @@ -57,13 +57,27 @@ try { die(); } /*----------------------------------********---------------------------------*/ - if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) { - $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; - $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = '#'; - $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; - $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = '#'; - $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_REQUEST['DYN_UID']; + $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; + $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = '#'; + $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; + $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = '#'; + $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_REQUEST['DYN_UID']; + $criteria = new Criteria(); + $criteria->addSelectColumn(DynaformPeer::DYN_CONTENT); + $criteria->add(DynaformPeer::DYN_UID, $_REQUEST['DYN_UID']); + $criteria->add(DynaformPeer::DYN_VERSION, 2); + $result = DynaformPeer::doSelectRS($criteria); + $result->setFetchmode(ResultSet::FETCHMODE_ASSOC); + if ($result->next()) { + G::LoadClass('pmDynaform'); + G::LoadClass('pmDynaform'); + $FieldsPmDynaform = $applicationFields; + $FieldsPmDynaform["CURRENT_DYNAFORM"] = $_REQUEST['DYN_UID']; + $a = new pmDynaform($FieldsPmDynaform); + $a->printView(); + } + if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) { G::LoadClass( 'dbConnections' ); $_SESSION['PROCESS'] = $applicationFields['PRO_UID']; $dbConnections = new dbConnections( $_SESSION['PROCESS'] ); diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php index 77bf5e6e2..06280b067 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php @@ -67,7 +67,7 @@ class ProcessPermissions extends Api * @param string $op_user_relation {@from body} {@choice 1,2} * @param string $op_case_status {@from body} {@choice ALL,DRAFT,TO_DO,PAUSED,COMPLETED} * @param string $op_participate {@from body} {@choice 0,1} - * @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY} + * @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY,SUMMARY_FORM} * @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE,RESEND} * @param string $tas_uid {@from body} * @param string $op_task_source {@from body} diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index 0df4bfed4..2ec0e90b5 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -21,6 +21,7 @@ var prj_uid = "{$prj_uid}"; var app_uid = "{$app_uid}"; var consolidated = "{$consolidated}"; + var enterprise = "{$enterprise}"; var prj_readonly = "{$prj_readonly}"; var credentials = "{$credentials}"; var distribution = "{$distribution}"; @@ -69,6 +70,7 @@ var prj_uid = "{$prj_uid}"; var app_uid = "{$app_uid}"; var consolidated = "{$consolidated}"; + var enterprise = "{$enterprise}"; var prj_readonly = "{$prj_readonly}"; var credentials = "{$credentials}"; var distribution = "{$distribution}";