fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-4450

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2018-03-28 08:31:06 -04:00
committed by Paula Quispe
parent a73fb850a3
commit 51840119ab
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
View File

@@ -337,7 +337,7 @@ class WebEntry
* *
* return void * return void
*/ */
protected function setWeData($webEntryUid, $arrayData) protected function setWeData($webEntryUid)
{ {
try { try {
//Verify data //Verify data
@@ -559,17 +559,15 @@ class WebEntry
} }
//Update //Update
if (!isset($arrayData['WE_LINK_GENERATION']) || $arrayData['WE_LINK_GENERATION']==='DEFAULT') { //Update where
//Update where $criteriaWhere = new \Criteria("workflow");
$criteriaWhere = new \Criteria("workflow"); $criteriaWhere->add(\WebEntryPeer::WE_UID, $webEntryUid);
$criteriaWhere->add(\WebEntryPeer::WE_UID, $webEntryUid);
//Update set //Update set
$criteriaSet = new \Criteria("workflow"); $criteriaSet = new \Criteria("workflow");
$criteriaSet->add(\WebEntryPeer::WE_DATA, $webEntryData); $criteriaSet->add(\WebEntryPeer::WE_DATA, $webEntryData);
\BasePeer::doUpdate($criteriaWhere, $criteriaSet, \Propel::getConnection("workflow")); \BasePeer::doUpdate($criteriaWhere, $criteriaSet, \Propel::getConnection("workflow"));
}
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
} }
@@ -639,7 +637,7 @@ class WebEntry
} }
//Set WE_DATA //Set WE_DATA
$this->setWeData($webEntryUid, $arrayData); $this->setWeData($webEntryUid);
//Return //Return
return $this->getWebEntry($webEntryUid); return $this->getWebEntry($webEntryUid);
@@ -720,7 +718,7 @@ class WebEntry
} }
//Set WE_DATA //Set WE_DATA
$this->setWeData($webEntryUid, $arrayData); $this->setWeData($webEntryUid);
//Return //Return
if (!$this->formatFieldNameInUppercase) { if (!$this->formatFieldNameInUppercase) {

7
workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
View File

@@ -400,6 +400,13 @@ class WebEntryEvent
$languages[] = $mLang['LANG_ID']; $languages[] = $mLang['LANG_ID'];
} }
$this->arrayFieldDefinition['WE_LINK_LANGUAGE']['defaultValues'] = $languages; $this->arrayFieldDefinition['WE_LINK_LANGUAGE']['defaultValues'] = $languages;
} else {
$this->arrayFieldDefinition['WE_LINK_SKIN']['required'] = false;
$this->arrayFieldDefinition['WE_LINK_LANGUAGE']['required'] = false;
$this->arrayFieldDefinition['WE_LINK_DOMAIN']['required'] = false;
$this->arrayFieldDefinition['WE_LINK_SKIN']['empty'] = true;
$this->arrayFieldDefinition['WE_LINK_LANGUAGE']['empty'] = true;
$this->arrayFieldDefinition['WE_LINK_DOMAIN']['empty'] = true;
} }
$process = new BusinessModelProcess(); $process = new BusinessModelProcess();