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

Merged in mcuiza/processmaker/pm-936 (pull request #1499)

Browse Source 
PM-936 (Agregar columna en lista de procesos)
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-20 15:04:32 -04:00
parent 8526bb85b2 f6877ba27d
commit c254f315d7
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,7 +182,7 @@ class Process extends BaseProcess
$this->setProCategory( $aData['PRO_CATEGORY'] );
$this->setProSubCategory( '' );
$this->setProIndustry( '' );
$this->setProCreateDate( 'now' );
$this->setProCreateDate( date("Y-m-d H:i:s") );
$this->setProCreateUser( $aData['USR_UID'] );
$this->setProHeight( 5000 );
$this->setProWidth( 10000 );

2
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -119,7 +119,7 @@ try {
if($proUid != "") {
$valuesProcess['PRO_UID'] = $proUid;
$valuesProcess['PRO_UPDATE_DATE'] = date("Y-m-d H:m:i");
$valuesProcess['PRO_UPDATE_DATE'] = date("Y-m-d H:i:s");
G::LoadClass('processes');
$infoProcess = new Processes();
$resultProcess = $infoProcess->updateProcessRow($valuesProcess);

9
workflow/engine/methods/processes/processes_Save.php
View File

@@ -96,6 +96,7 @@ switch ($function) {
$resultProcessNew = $infoProcess->load($_POST['form']['PRO_UID']);
$oldFields = array_diff_assoc($resultProcessOld,$resultProcessNew);
$newFields = array_diff_assoc($resultProcessNew,$resultProcessOld);
$fields = array();
if(array_key_exists('PRO_TITLE', $newFields)) {
$fields[] = G::LoadTranslation('ID_TITLE');
@@ -143,3 +144,11 @@ if(array_key_exists('PRO_TYPE_PROCESS', $newFields)) {
$fields[] = "Type of process (only owners can edit private processes)";
}
G::auditLog('EditProcess','Edit fields ('.implode(', ',$fields).') in process "'.$_POST['form']['PRO_TITLE'].'"');
if(isset($_POST['form']['PRO_UID']) && !empty($_POST['form']['PRO_UID'])) {
$valuesProcess['PRO_UID'] = $_POST['form']['PRO_UID'];
$valuesProcess['PRO_UPDATE_DATE'] = date("Y-m-d H:i:s");
G::LoadClass('processes');
$infoProcess = new Processes();
$resultProcess = $infoProcess->updateProcessRow($valuesProcess);
}