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

HOR-1019 "Add option to force the ABE user to login..." SOLVED

Browse Source 
Issue:
    Add option to force the ABE user to login in ProcessMaker before executing Action
Cause:
    Nuevo requerimiento
Solution:
    Se implemento la opcion "Force user login" (Back-end y Front-end)
This commit is contained in:
Victor Saisa Lopez
2016-05-19 14:52:24 -04:00
parent dc0658e90a
commit 41c13dae23
15 changed files with 612 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
workflow/engine/classes/model/AbeConfiguration.php
View File

@@ -16,9 +16,24 @@ require_once 'classes/model/om/BaseAbeConfiguration.php';
class AbeConfiguration extends BaseAbeConfiguration
{
private $filterThisFields = array('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE',
'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID','ABE_EMAIL_FIELD',
'ABE_ACTION_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_CREATE_DATE','ABE_UPDATE_DATE','ABE_MAILSERVER_OR_MAILCURRENT','ABE_SUBJECT_FIELD','ABE_CUSTOM_GRID');
private $filterThisFields = [
'ABE_UID',
'PRO_UID',
'TAS_UID',
'ABE_TYPE',
'ABE_TEMPLATE',
'ABE_DYN_TYPE',
'DYN_UID',
'ABE_EMAIL_FIELD',
'ABE_ACTION_FIELD',
'ABE_CASE_NOTE_IN_RESPONSE',
'ABE_FORCE_LOGIN',
'ABE_CREATE_DATE',
'ABE_UPDATE_DATE',
'ABE_SUBJECT_FIELD',
'ABE_MAILSERVER_OR_MAILCURRENT',
'ABE_CUSTOM_GRID'
];
public function load($abeUid)
{
@@ -54,11 +69,11 @@ class AbeConfiguration extends BaseAbeConfiguration
} else {
$abeConfigurationInstance = AbeConfigurationPeer::retrieveByPK($data['ABE_UID']);
}
if (isset($data['ABE_CUSTOM_GRID'])) {
$data['ABE_CUSTOM_GRID'] = serialize($data['ABE_CUSTOM_GRID']);
} else {
$data['ABE_CUSTOM_GRID'] = "";
$data['ABE_CUSTOM_GRID'] = "";
}
$data['ABE_UPDATE_DATE'] = date('Y-m-d H:i:s');

2
workflow/engine/classes/model/map/AbeConfigurationMapBuilder.php
View File

@@ -85,6 +85,8 @@ class AbeConfigurationMapBuilder
$tMap->addColumn('ABE_CASE_NOTE_IN_RESPONSE', 'AbeCaseNoteInResponse', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('ABE_FORCE_LOGIN', 'AbeForceLogin', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('ABE_CREATE_DATE', 'AbeCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('ABE_UPDATE_DATE', 'AbeUpdateDate', 'int', CreoleTypes::TIMESTAMP, false, null);

106
workflow/engine/classes/model/om/BaseAbeConfiguration.php
View File

@@ -87,6 +87,12 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
*/
protected $abe_case_note_in_response = 0;
/**
* The value for the abe_force_login field.
* @var int
*/
protected $abe_force_login = 0;
/**
* The value for the abe_create_date field.
* @var int
@@ -241,6 +247,17 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
return $this->abe_case_note_in_response;
}
/**
* Get the [abe_force_login] column value.
*
* @return int
*/
public function getAbeForceLogin()
{
return $this->abe_force_login;
}
/**
* Get the [optionally formatted] [abe_create_date] column value.
*
@@ -558,6 +575,28 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
} // setAbeCaseNoteInResponse()
/**
* Set the value of [abe_force_login] column.
*
* @param int $v new value
* @return void
*/
public function setAbeForceLogin($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->abe_force_login !== $v || $v === 0) {
$this->abe_force_login = $v;
$this->modifiedColumns[] = AbeConfigurationPeer::ABE_FORCE_LOGIN;
}
} // setAbeForceLogin()
/**
* Set the value of [abe_create_date] column.
*
@@ -719,22 +758,24 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$this->abe_case_note_in_response = $rs->getInt($startcol + 9);
$this->abe_create_date = $rs->getTimestamp($startcol + 10, null);
$this->abe_force_login = $rs->getInt($startcol + 10);
$this->abe_update_date = $rs->getTimestamp($startcol + 11, null);
$this->abe_create_date = $rs->getTimestamp($startcol + 11, null);
$this->abe_subject_field = $rs->getString($startcol + 12);
$this->abe_update_date = $rs->getTimestamp($startcol + 12, null);
$this->abe_mailserver_or_mailcurrent = $rs->getInt($startcol + 13);
$this->abe_subject_field = $rs->getString($startcol + 13);
$this->abe_custom_grid = $rs->getString($startcol + 14);
$this->abe_mailserver_or_mailcurrent = $rs->getInt($startcol + 14);
$this->abe_custom_grid = $rs->getString($startcol + 15);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 15; // 15 = AbeConfigurationPeer::NUM_COLUMNS - AbeConfigurationPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 16; // 16 = AbeConfigurationPeer::NUM_COLUMNS - AbeConfigurationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating AbeConfiguration object", $e);
@@ -969,18 +1010,21 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
return $this->getAbeCaseNoteInResponse();
break;
case 10:
return $this->getAbeCreateDate();
return $this->getAbeForceLogin();
break;
case 11:
return $this->getAbeUpdateDate();
return $this->getAbeCreateDate();
break;
case 12:
return $this->getAbeSubjectField();
return $this->getAbeUpdateDate();
break;
case 13:
return $this->getAbeMailserverOrMailcurrent();
return $this->getAbeSubjectField();
break;
case 14:
return $this->getAbeMailserverOrMailcurrent();
break;
case 15:
return $this->getAbeCustomGrid();
break;
default:
@@ -1013,11 +1057,12 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$keys[7] => $this->getAbeEmailField(),
$keys[8] => $this->getAbeActionField(),
$keys[9] => $this->getAbeCaseNoteInResponse(),
$keys[10] => $this->getAbeCreateDate(),
$keys[11] => $this->getAbeUpdateDate(),
$keys[12] => $this->getAbeSubjectField(),
$keys[13] => $this->getAbeMailserverOrMailcurrent(),
$keys[14] => $this->getAbeCustomGrid(),
$keys[10] => $this->getAbeForceLogin(),
$keys[11] => $this->getAbeCreateDate(),
$keys[12] => $this->getAbeUpdateDate(),
$keys[13] => $this->getAbeSubjectField(),
$keys[14] => $this->getAbeMailserverOrMailcurrent(),
$keys[15] => $this->getAbeCustomGrid(),
);
return $result;
}
@@ -1080,18 +1125,21 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$this->setAbeCaseNoteInResponse($value);
break;
case 10:
$this->setAbeCreateDate($value);
$this->setAbeForceLogin($value);
break;
case 11:
$this->setAbeUpdateDate($value);
$this->setAbeCreateDate($value);
break;
case 12:
$this->setAbeSubjectField($value);
$this->setAbeUpdateDate($value);
break;
case 13:
$this->setAbeMailserverOrMailcurrent($value);
$this->setAbeSubjectField($value);
break;
case 14:
$this->setAbeMailserverOrMailcurrent($value);
break;
case 15:
$this->setAbeCustomGrid($value);
break;
} // switch()
@@ -1158,23 +1206,27 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
}
if (array_key_exists($keys[10], $arr)) {
$this->setAbeCreateDate($arr[$keys[10]]);
$this->setAbeForceLogin($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setAbeUpdateDate($arr[$keys[11]]);
$this->setAbeCreateDate($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setAbeSubjectField($arr[$keys[12]]);
$this->setAbeUpdateDate($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setAbeMailserverOrMailcurrent($arr[$keys[13]]);
$this->setAbeSubjectField($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setAbeCustomGrid($arr[$keys[14]]);
$this->setAbeMailserverOrMailcurrent($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
$this->setAbeCustomGrid($arr[$keys[15]]);
}
}
@@ -1228,6 +1280,10 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$criteria->add(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, $this->abe_case_note_in_response);
}
if ($this->isColumnModified(AbeConfigurationPeer::ABE_FORCE_LOGIN)) {
$criteria->add(AbeConfigurationPeer::ABE_FORCE_LOGIN, $this->abe_force_login);
}
if ($this->isColumnModified(AbeConfigurationPeer::ABE_CREATE_DATE)) {
$criteria->add(AbeConfigurationPeer::ABE_CREATE_DATE, $this->abe_create_date);
}
@@ -1320,6 +1376,8 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$copyObj->setAbeCaseNoteInResponse($this->abe_case_note_in_response);
$copyObj->setAbeForceLogin($this->abe_force_login);
$copyObj->setAbeCreateDate($this->abe_create_date);
$copyObj->setAbeUpdateDate($this->abe_update_date);

23
workflow/engine/classes/model/om/BaseAbeConfigurationPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseAbeConfigurationPeer
const CLASS_DEFAULT = 'classes.model.AbeConfiguration';
/** The total number of columns. */
const NUM_COLUMNS = 15;
const NUM_COLUMNS = 16;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -61,6 +61,9 @@ abstract class BaseAbeConfigurationPeer
/** the column name for the ABE_CASE_NOTE_IN_RESPONSE field */
const ABE_CASE_NOTE_IN_RESPONSE = 'ABE_CONFIGURATION.ABE_CASE_NOTE_IN_RESPONSE';
/** the column name for the ABE_FORCE_LOGIN field */
const ABE_FORCE_LOGIN = 'ABE_CONFIGURATION.ABE_FORCE_LOGIN';
/** the column name for the ABE_CREATE_DATE field */
const ABE_CREATE_DATE = 'ABE_CONFIGURATION.ABE_CREATE_DATE';
@@ -87,10 +90,10 @@ abstract class BaseAbeConfigurationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AbeUid', 'ProUid', 'TasUid', 'AbeType', 'AbeTemplate', 'AbeDynType', 'DynUid', 'AbeEmailField', 'AbeActionField', 'AbeCaseNoteInResponse', 'AbeCreateDate', 'AbeUpdateDate', 'AbeSubjectField', 'AbeMailserverOrMailcurrent', 'AbeCustomGrid', ),
BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID, AbeConfigurationPeer::PRO_UID, AbeConfigurationPeer::TAS_UID, AbeConfigurationPeer::ABE_TYPE, AbeConfigurationPeer::ABE_TEMPLATE, AbeConfigurationPeer::ABE_DYN_TYPE, AbeConfigurationPeer::DYN_UID, AbeConfigurationPeer::ABE_EMAIL_FIELD, AbeConfigurationPeer::ABE_ACTION_FIELD, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, AbeConfigurationPeer::ABE_CREATE_DATE, AbeConfigurationPeer::ABE_UPDATE_DATE, AbeConfigurationPeer::ABE_SUBJECT_FIELD, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT, AbeConfigurationPeer::ABE_CUSTOM_GRID, ),
BasePeer::TYPE_FIELDNAME => array ('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE', 'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID', 'ABE_EMAIL_FIELD', 'ABE_ACTION_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_CREATE_DATE', 'ABE_UPDATE_DATE', 'ABE_SUBJECT_FIELD', 'ABE_MAILSERVER_OR_MAILCURRENT', 'ABE_CUSTOM_GRID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
BasePeer::TYPE_PHPNAME => array ('AbeUid', 'ProUid', 'TasUid', 'AbeType', 'AbeTemplate', 'AbeDynType', 'DynUid', 'AbeEmailField', 'AbeActionField', 'AbeCaseNoteInResponse', 'AbeForceLogin', 'AbeCreateDate', 'AbeUpdateDate', 'AbeSubjectField', 'AbeMailserverOrMailcurrent', 'AbeCustomGrid', ),
BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID, AbeConfigurationPeer::PRO_UID, AbeConfigurationPeer::TAS_UID, AbeConfigurationPeer::ABE_TYPE, AbeConfigurationPeer::ABE_TEMPLATE, AbeConfigurationPeer::ABE_DYN_TYPE, AbeConfigurationPeer::DYN_UID, AbeConfigurationPeer::ABE_EMAIL_FIELD, AbeConfigurationPeer::ABE_ACTION_FIELD, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, AbeConfigurationPeer::ABE_FORCE_LOGIN, AbeConfigurationPeer::ABE_CREATE_DATE, AbeConfigurationPeer::ABE_UPDATE_DATE, AbeConfigurationPeer::ABE_SUBJECT_FIELD, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT, AbeConfigurationPeer::ABE_CUSTOM_GRID, ),
BasePeer::TYPE_FIELDNAME => array ('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE', 'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID', 'ABE_EMAIL_FIELD', 'ABE_ACTION_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_FORCE_LOGIN', 'ABE_CREATE_DATE', 'ABE_UPDATE_DATE', 'ABE_SUBJECT_FIELD', 'ABE_MAILSERVER_OR_MAILCURRENT', 'ABE_CUSTOM_GRID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
);
/**
@@ -100,10 +103,10 @@ abstract class BaseAbeConfigurationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AbeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'AbeType' => 3, 'AbeTemplate' => 4, 'AbeDynType' => 5, 'DynUid' => 6, 'AbeEmailField' => 7, 'AbeActionField' => 8, 'AbeCaseNoteInResponse' => 9, 'AbeCreateDate' => 10, 'AbeUpdateDate' => 11, 'AbeSubjectField' => 12, 'AbeMailserverOrMailcurrent' => 13, 'AbeCustomGrid' => 14, ),
BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID => 0, AbeConfigurationPeer::PRO_UID => 1, AbeConfigurationPeer::TAS_UID => 2, AbeConfigurationPeer::ABE_TYPE => 3, AbeConfigurationPeer::ABE_TEMPLATE => 4, AbeConfigurationPeer::ABE_DYN_TYPE => 5, AbeConfigurationPeer::DYN_UID => 6, AbeConfigurationPeer::ABE_EMAIL_FIELD => 7, AbeConfigurationPeer::ABE_ACTION_FIELD => 8, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE => 9, AbeConfigurationPeer::ABE_CREATE_DATE => 10, AbeConfigurationPeer::ABE_UPDATE_DATE => 11, AbeConfigurationPeer::ABE_SUBJECT_FIELD => 12, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT => 13, AbeConfigurationPeer::ABE_CUSTOM_GRID => 14, ),
BasePeer::TYPE_FIELDNAME => array ('ABE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'ABE_TYPE' => 3, 'ABE_TEMPLATE' => 4, 'ABE_DYN_TYPE' => 5, 'DYN_UID' => 6, 'ABE_EMAIL_FIELD' => 7, 'ABE_ACTION_FIELD' => 8, 'ABE_CASE_NOTE_IN_RESPONSE' => 9, 'ABE_CREATE_DATE' => 10, 'ABE_UPDATE_DATE' => 11, 'ABE_SUBJECT_FIELD' => 12, 'ABE_MAILSERVER_OR_MAILCURRENT' => 13, 'ABE_CUSTOM_GRID' => 14, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
BasePeer::TYPE_PHPNAME => array ('AbeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'AbeType' => 3, 'AbeTemplate' => 4, 'AbeDynType' => 5, 'DynUid' => 6, 'AbeEmailField' => 7, 'AbeActionField' => 8, 'AbeCaseNoteInResponse' => 9, 'AbeForceLogin' => 10, 'AbeCreateDate' => 11, 'AbeUpdateDate' => 12, 'AbeSubjectField' => 13, 'AbeMailserverOrMailcurrent' => 14, 'AbeCustomGrid' => 15, ),
BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID => 0, AbeConfigurationPeer::PRO_UID => 1, AbeConfigurationPeer::TAS_UID => 2, AbeConfigurationPeer::ABE_TYPE => 3, AbeConfigurationPeer::ABE_TEMPLATE => 4, AbeConfigurationPeer::ABE_DYN_TYPE => 5, AbeConfigurationPeer::DYN_UID => 6, AbeConfigurationPeer::ABE_EMAIL_FIELD => 7, AbeConfigurationPeer::ABE_ACTION_FIELD => 8, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE => 9, AbeConfigurationPeer::ABE_FORCE_LOGIN => 10, AbeConfigurationPeer::ABE_CREATE_DATE => 11, AbeConfigurationPeer::ABE_UPDATE_DATE => 12, AbeConfigurationPeer::ABE_SUBJECT_FIELD => 13, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT => 14, AbeConfigurationPeer::ABE_CUSTOM_GRID => 15, ),
BasePeer::TYPE_FIELDNAME => array ('ABE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'ABE_TYPE' => 3, 'ABE_TEMPLATE' => 4, 'ABE_DYN_TYPE' => 5, 'DYN_UID' => 6, 'ABE_EMAIL_FIELD' => 7, 'ABE_ACTION_FIELD' => 8, 'ABE_CASE_NOTE_IN_RESPONSE' => 9, 'ABE_FORCE_LOGIN' => 10, 'ABE_CREATE_DATE' => 11, 'ABE_UPDATE_DATE' => 12, 'ABE_SUBJECT_FIELD' => 13, 'ABE_MAILSERVER_OR_MAILCURRENT' => 14, 'ABE_CUSTOM_GRID' => 15, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
);
/**
@@ -224,6 +227,8 @@ abstract class BaseAbeConfigurationPeer
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_FORCE_LOGIN);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_CREATE_DATE);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_UPDATE_DATE);