From bb21a60f4228ba23e263897570c2f0c54d8e2422 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Sat, 7 Mar 2015 14:05:53 -0400 Subject: [PATCH 01/20] I solve the problem when save the default gateway --- .../Project/Adapter/BpmnWorkflow.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index dd7ba7f6f..f245734e1 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -1666,6 +1666,8 @@ class BpmnWorkflow extends Project\Bpmn * Diagram's Flows Handling */ $whiteList = array(); + $defaultFlow = array(); + $pos = 0; foreach ($diagram["flows"] as $i => $flowData) { $flowData = array_change_key_case($flowData, CASE_UPPER); @@ -1693,6 +1695,12 @@ class BpmnWorkflow extends Project\Bpmn $flowData["FLO_ELEMENT_DEST"] = $mappedUid; } } + //Save the default flow Uid's + if($flowData["FLO_TYPE"] == 'DEFAULT'){ + $defaultFlow[$pos]['GAT_UID'] = $flowData["FLO_ELEMENT_ORIGIN"]; + $defaultFlow[$pos]['GAT_DEFAULT_FLOW'] = $flowData["FLO_UID"]; + $pos++; + } //Update UIDs foreach ($result as $value) { @@ -1735,6 +1743,17 @@ class BpmnWorkflow extends Project\Bpmn } $bwp->mapBpmnFlowsToWorkflowRoutes(); + + //Update the Default gateway + $gateways = $bwp->getGateways(); + foreach ($gateways as $gatewayData) { + foreach ($defaultFlow as $def) { + if($gatewayData["GAT_UID"] == $def["GAT_UID"]){ + $gatewayData["GAT_DEFAULT_FLOW"] = $def["GAT_DEFAULT_FLOW"]; + $bwp->updateGateway($gatewayData["GAT_UID"], $gatewayData); + } + } + } return $result; } From 6520dba83debe536ce77560b6173b8187c6bb15e Mon Sep 17 00:00:00 2001 From: Brayan Pereyra Date: Mon, 9 Mar 2015 08:44:59 -0400 Subject: [PATCH 02/20] Quitando guardado de contadores para listados --- .../engine/classes/model/ListCompleted.php | 9 +----- workflow/engine/classes/model/ListInbox.php | 31 ------------------- .../classes/model/ListParticipatedLast.php | 8 ----- 3 files changed, 1 insertion(+), 47 deletions(-) diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index cfefd507a..900d64baa 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -93,14 +93,7 @@ class ListCompleted extends BaseListCompleted $criteriaSet = new Criteria("workflow"); $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - - $users = new Users(); - $users->refreshTotal($data['USR_UID'], 'add', 'completed'); - if ($data['DEL_PREVIOUS'] != 0) { - $users->refreshTotal($data['USR_UID'], 'remove', 'inbox'); - } else { - $users->refreshTotal($data['USR_UID'], 'remove', 'draft'); - } + $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index f3a40066c..2ad27b9c2 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -143,7 +143,6 @@ class ListInbox extends BaseListInbox public function newRow ($data, $delPreviusUsrUid) { - $users = new Users(); $data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid; if (isset($data['DEL_TASK_DUE_DATE'])) { $data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE']; @@ -212,36 +211,6 @@ class ListInbox extends BaseListInbox $data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME']; } - - if ($data['APP_STATUS'] == 'DRAFT') { - $users->refreshTotal($data['USR_UID'], 'add', 'draft'); - } else { - $criteria = new Criteria(); - $criteria->addSelectColumn(SubApplicationPeer::APP_UID); - $criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); - $dataset = SubApplicationPeer::doSelectRS($criteria); - if ($dataset->next()) { - $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox'); - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); - } else if ($data['DEL_INDEX'] == 2) { - $users->refreshTotal($delPreviusUsrUid, 'remove', 'draft'); - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); - } else { - $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox'); - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); - } - /* - if ($data['DEL_INDEX'] == 1) { - $users->refreshTotal($data['USR_UID'], 'add', 'draft'); - } elseif ($data['DEL_INDEX'] == 2) { - $users->refreshTotal($delPreviusUsrUid, 'remove', 'draft'); - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); - } else { - $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox'); - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); - }*/ - } - self::create($data); } diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index 085921ade..f46e9a97d 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -48,9 +48,6 @@ class ListParticipatedLast extends BaseListParticipatedLast $aRow = $dataset->getRow(); $data['APP_STATUS'] = $aRow['APP_STATUS']; - $users = new Users(); - $users->refreshTotal($data['USR_UID'], 'add', 'participated'); - $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); if ($this->validate()) { @@ -134,11 +131,6 @@ class ListParticipatedLast extends BaseListParticipatedLast */ public function remove ($app_uid, $usr_uid) { - $existField = ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid); - if (! is_null( $existField )) { - $users = new Users(); - $users->refreshTotal($usr_uid, 'removed', 'participated'); - } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->setAppUid($app_uid); From b09d5d90ab6a2499a9b6afb78597ed456dcd65c6 Mon Sep 17 00:00:00 2001 From: Brayan Pereyra Date: Mon, 9 Mar 2015 08:53:46 -0400 Subject: [PATCH 03/20] Adicion de linea eliminada --- workflow/engine/classes/model/ListParticipatedLast.php | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index f46e9a97d..e6432b170 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -48,6 +48,7 @@ class ListParticipatedLast extends BaseListParticipatedLast $aRow = $dataset->getRow(); $data['APP_STATUS'] = $aRow['APP_STATUS']; + $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); if ($this->validate()) { From d3d6a01e23ae701aebac87f7dd8561236d00359f Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 9 Mar 2015 10:00:07 -0400 Subject: [PATCH 04/20] I solved the issue PM-1553 --- workflow/engine/controllers/newSiteProxy.php | 2 ++ workflow/engine/methods/login/login.php | 6 ++++++ workflow/engine/methods/services/login_getStarted.php | 7 +++++++ workflow/engine/templates/services/login_getStarted.html | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php index 7763e6fb6..5a5d0ae0b 100755 --- a/workflow/engine/controllers/newSiteProxy.php +++ b/workflow/engine/controllers/newSiteProxy.php @@ -37,6 +37,8 @@ class newSiteProxy extends HttpProxyController ), ($action === 'create') ? true : false ); $result['result']['admin']['password'] = ($pass === $pass1) ? true : false; $result['result']['action'] = $action; + $_SESSION['NW_PASSWORD'] = $pass; + $_SESSION['NW_PASSWORD2'] = $pass1; //$json = new Services_JSON(); //G::pr($result['result']['database']);G::pr($action); $dbWf = $result['result']['database']['ao']['ao_db_wf']['status']; diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php index f5ec92edf..ea533f27b 100755 --- a/workflow/engine/methods/login/login.php +++ b/workflow/engine/methods/login/login.php @@ -60,6 +60,9 @@ $sFailedLogins = $_SESSION['FAILED_LOGINS']; $usernamePrevious1 = $_SESSION["USERNAME_PREVIOUS1"]; $usernamePrevious2 = $_SESSION["USERNAME_PREVIOUS2"]; +$pass = (isset($_SESSION['NW_PASSWORD'])) ? $_SESSION['NW_PASSWORD'] : ''; +$pass1 = (isset($_SESSION['NW_PASSWORD2'])) ? $_SESSION['NW_PASSWORD2'] : ''; + $aFields['LOGIN_VERIFY_MSG'] = G::loadTranslation('LOGIN_VERIFY_MSG'); //$aFields['LOGIN_VERIFY_MSG'] = Bootstrap::loadTranslation('LOGIN_VERIFY_MSG'); @@ -135,6 +138,9 @@ $_SESSION['FAILED_LOGINS'] = $sFailedLogins; $_SESSION["USERNAME_PREVIOUS1"] = $usernamePrevious1; $_SESSION["USERNAME_PREVIOUS2"] = $usernamePrevious2; +$_SESSION['NW_PASSWORD'] = $pass; +$_SESSION['NW_PASSWORD2'] = $pass1; + /*----------------------------------********---------------------------------*/ if (!class_exists('pmLicenseManager')) { G::LoadClass('pmLicenseManager'); diff --git a/workflow/engine/methods/services/login_getStarted.php b/workflow/engine/methods/services/login_getStarted.php index 52aa0bd92..914467b13 100755 --- a/workflow/engine/methods/services/login_getStarted.php +++ b/workflow/engine/methods/services/login_getStarted.php @@ -42,6 +42,12 @@ $oTemplatePower->assign('USR_UID', $aUser['USR_UID']); $oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')'); */ $userName = 'admin'; +$userPass = 'The password introduced at the time of installing the application'; +if(isset($_SESSION['NW_PASSWORD'])){ + if($_SESSION['NW_PASSWORD'] != ''){ + $userPass = $_SESSION['NW_PASSWORD']; + } +} require_once 'classes/model/Users.php'; $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME); @@ -56,6 +62,7 @@ if ($oDataset->next()) { $oTemplatePower->assign("URL_MABORAK_JS", G::browserCacheFilesUrl("/js/maborak/core/maborak.js")); $oTemplatePower->assign("name", $userName); +$oTemplatePower->assign("pass", $userPass); $G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower ); diff --git a/workflow/engine/templates/services/login_getStarted.html b/workflow/engine/templates/services/login_getStarted.html index 2ccc6f855..84371dff0 100755 --- a/workflow/engine/templates/services/login_getStarted.html +++ b/workflow/engine/templates/services/login_getStarted.html @@ -71,7 +71,7 @@

Welcome to ProcessMaker!

To get started, log in using the following credentials. You can change them later:

Username: {name}
- Password: The password introduced at the time of installing the application + Password: {pass}

We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at http://www.processmaker.com/demos/

Other Resources:

From af8c856c96ac50af928366380cc110e4cf5311a0 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Mon, 9 Mar 2015 13:20:13 -0400 Subject: [PATCH 05/20] PM-1744 No se pueden adjuntar archivos en el editor de Templates. Causa: Leve conflicto con el manejo del .html Solucion: Hacer un barrido del .html y realizar ciertos ajustes en funcion de la plantilla .html. --- .../jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php index 4828969dd..88e883b82 100644 --- a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php +++ b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php @@ -36,7 +36,9 @@ function uploadContentFile() $FileObject = $_FILES["upload_file"]; // find data on the file $DestPath = sys_get_temp_dir(); $aux=''; - $chain=str_replace ("\r\n","",file_get_contents(htmlentities($FileObject['tmp_name']))); + $chain = preg_replace("/\r\n+|\r+|\n+|\t+/i", ' ', file_get_contents(htmlentities($FileObject['tmp_name']))); + $chain=preg_replace('#(.*?)#is', ' ', $chain); + $chain=strip_tags($chain, '