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

Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629

Browse Source
This commit is contained in:
Ronald Quenta
2017-08-10 18:33:14 -04:00
parent 9a1f8b7fdc 702eb8ac9d
commit 917c94784b
68 changed files with 818 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/FieldCondition.php
View File

@@ -137,7 +137,7 @@ class FieldCondition extends BaseFieldCondition
$oDynaform = DynaformPeer::retrieveByPk( $DYN_UID );
$PRO_UID = $oDynaform->getProUid();
$this->oDynaformHandler = new dynaFormHandler( PATH_DYNAFORM . "$PRO_UID/$DYN_UID" . '.xml' );
$this->oDynaformHandler = new DynaformHandler( PATH_DYNAFORM . "$PRO_UID/$DYN_UID" . '.xml' );
$aDynaformFields = $this->oDynaformHandler->getFieldNames();
for ($i = 0; $i < count( $aDynaformFields ); $i ++) {
$aDynaformFields[$i] = "'$aDynaformFields[$i]'";

8
workflow/engine/classes/model/Language.php
View File

@@ -247,7 +247,7 @@ class Language extends BaseLanguage
}
$dynaform = new dynaFormHandler( PATH_XMLFORM . $xmlForm );
$dynaform = new DynaformHandler( PATH_XMLFORM . $xmlForm );
$fieldName = $match[2];
$codes = explode( '-', $reference );
@@ -460,7 +460,7 @@ class Language extends BaseLanguage
$xmlFormFile = str_replace( chr( 92 ), '/', $xmlFormPath );
$xmlFormFile = str_replace( PATH_XMLFORM, '', $xmlFormPath );
$dynaForm = new dynaFormHandler( $xmlFormPath );
$dynaForm = new DynaformHandler( $xmlFormPath );
$dynaNodes = $dynaForm->getFields();
@@ -635,7 +635,7 @@ class Language extends BaseLanguage
}
$dynaform = new dynaFormHandler( PATH_PLUGINS . $plugin . PATH_SEP . $xmlForm );
$dynaform = new DynaformHandler( PATH_PLUGINS . $plugin . PATH_SEP . $xmlForm );
$fieldName = $match[2];
$codes = explode( '-', $reference );
@@ -753,7 +753,7 @@ class Language extends BaseLanguage
foreach ($aXMLForms as $xmlFormPath) {
$xmlFormFile = str_replace( chr( 92 ), '/', $xmlFormPath );
$xmlFormFile = str_replace( PATH_PLUGINS . $plugin . PATH_SEP , '', $xmlFormPath );
$dynaForm = new dynaFormHandler( $xmlFormPath );
$dynaForm = new DynaformHandler( $xmlFormPath );
$dynaNodes = $dynaForm->getFields();
//get all fields of each xmlform
foreach ($dynaNodes as $oNode) {

6
workflow/engine/classes/model/Step.php
View File

@@ -374,7 +374,7 @@ class Step extends BaseStep
while ($oDataset->next()) {
$aRow1 = $oDataset->getRow();
//print_r($aRow1);
$dynHandler = new dynaFormHandler(PATH_DYNAFORM . $sproUid . PATH_SEP . $aRow1["DYN_UID"] . ".xml");
$dynHandler = new DynaformHandler(PATH_DYNAFORM . $sproUid . PATH_SEP . $aRow1["DYN_UID"] . ".xml");
$dynFields = $dynHandler->getFields();
$sxmlgrid = '';
$sType = '';
@@ -477,7 +477,7 @@ class Step extends BaseStep
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
if ($aRow['DYN_TYPE'] == 'xmlform') {
$dynHandler = new dynaFormHandler( PATH_DYNAFORM . $aRow['DYN_FILENAME'] . ".xml" );
$dynHandler = new DynaformHandler( PATH_DYNAFORM . $aRow['DYN_FILENAME'] . ".xml" );
$dynFields = $dynHandler->getFields();
$sxmlgrid = '';
$sType = '';
@@ -547,7 +547,7 @@ class Step extends BaseStep
while ($oDataset->next()) {
$aRow1 = $oDataset->getRow();
$dynHandler = new dynaFormHandler( PATH_DYNAFORM . $sproUid . "/" . $sObjUID . ".xml" );
$dynHandler = new DynaformHandler( PATH_DYNAFORM . $sproUid . "/" . $sObjUID . ".xml" );
$dynFields = $dynHandler->getFields();
$sxmlgrid = '';
$sType = '';

19
workflow/engine/classes/model/Users.php
View File

@@ -490,4 +490,23 @@ class Users extends BaseUsers
$criteria->add(UsersPeer::USR_ID, $id);
return UsersPeer::doSelect($criteria)[0];
}
/**
* {@inheritdoc} except USR_PASSWORD, for security reasons.
*
* @param string $keyType One of the class type constants TYPE_PHPNAME,
* TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
* @return an associative array containing the field names (as keys) and field values
*/
public function toArray($keyType = BasePeer::TYPE_PHPNAME)
{
$key = UsersPeer::translateFieldName(
UsersPeer::USR_PASSWORD,
BasePeer::TYPE_COLNAME,
$keyType
);
$array = parent::toArray($keyType);
unset($array[$key]);
return $array;
}
}