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

fix code style

Browse Source 
add to upgrade
This commit is contained in:
davidcallizaya
2017-02-20 11:15:23 -04:00
parent ad1a8d2079
commit dbdd5a11a5
11 changed files with 129 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/bin/tasks/cliListIds.php
View File

@@ -16,7 +16,7 @@ function list_ids($command, $args)
foreach ($workspaces as $index => $workspace) {
$hostPort1 = explode(":", $workspace->dbInfo['DB_HOST']);
$hostPort = $hostPort1[0].(isset($hostPort[1]) ? ";port=".$hostPort[1] : "");
$hostPort = $hostPort1[0] . (isset($hostPort[1]) ? ";port=" . $hostPort[1] : "");
$connectionString = sprintf("%s:host=%s;dbname=%s",
$workspace->dbInfo['DB_ADAPTER'], $hostPort,
$workspace->dbInfo['DB_NAME']);
@@ -49,8 +49,7 @@ function list_ids($command, $args)
$dbh->query('UPDATE LIST_UNASSIGNED SET '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);');
$dbh->query('UPDATE LIST_UNASSIGNED_GROUP SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID); '
);
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);');
}
//Done

34
workflow/engine/classes/class.wsTools.php
View File

@@ -3631,6 +3631,40 @@ class workspaceTools
$con->commit();
CLI::logging("-> Migrating And Populating Indexing for avoiding the use of table APP_CACHE_VIEW Done \n");
// Populating PRO_ID, USR_ID
CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* \n");
$con->begin();
$stmt = $con->createStatement();
$rs = $stmt->executeQuery();
$stmt->executeQuery('UPDATE LIST_CANCELLED SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELLED.USR_UID), '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELLED.PRO_UID);');
$stmt->executeQuery('UPDATE LIST_COMPLETED SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)');
$stmt->executeQuery('UPDATE LIST_INBOX SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID);');
$stmt->executeQuery('UPDATE LIST_MY_INBOX SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID), '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID);');
$stmt->executeQuery('UPDATE LIST_PARTICIPATED_HISTORY SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID), '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID);');
$stmt->executeQuery('UPDATE LIST_PARTICIPATED_LAST SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID), '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID);');
$stmt->executeQuery('UPDATE LIST_PAUSED SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID), '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID);');
$stmt->executeQuery('UPDATE LIST_UNASSIGNED SET '
. 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);');
$stmt->executeQuery('UPDATE LIST_UNASSIGNED_GROUP SET '
. 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);');
$con->commit();
CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* Done \n");
}
}

16
workflow/engine/classes/model/ListCanceled.php
View File

@@ -106,9 +106,13 @@ class ListCanceled extends BaseListCanceled {
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if (!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if (!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -137,9 +141,13 @@ class ListCanceled extends BaseListCanceled {
public function update($data)
{
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if (!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if (!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME );
try {
$con->begin();

16
workflow/engine/classes/model/ListCompleted.php
View File

@@ -98,9 +98,13 @@ class ListCompleted extends BaseListCompleted
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if (!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if (!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -129,9 +133,13 @@ class ListCompleted extends BaseListCompleted
public function update($data)
{
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if (!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if (!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
try {
$con->begin();

16
workflow/engine/classes/model/ListInbox.php
View File

@@ -33,9 +33,13 @@ class ListInbox extends BaseListInbox
$data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']);
}
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if (!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if (!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
if ($this->validate()) {
$result = $this->save();
@@ -151,9 +155,13 @@ class ListInbox extends BaseListInbox
}
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if (!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if (!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
try {
$con->begin();

12
workflow/engine/classes/model/ListMyInbox.php
View File

@@ -26,9 +26,13 @@ class ListMyInbox extends BaseListMyInbox
public function create($data)
{
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if (!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if (!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -59,7 +63,9 @@ class ListMyInbox extends BaseListMyInbox
$p = new Process();
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME );
try {
$con->begin();

16
workflow/engine/classes/model/ListParticipatedHistory.php
View File

@@ -26,9 +26,13 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
public function create($data)
{
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if(!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -57,9 +61,13 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
public function update($data)
{
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if(!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME );
try {
$con->begin();

16
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -71,9 +71,13 @@ class ListParticipatedLast extends BaseListParticipatedLast
}
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if(!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -103,9 +107,13 @@ class ListParticipatedLast extends BaseListParticipatedLast
{
$data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN';
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if(!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try {
$con->begin();

16
workflow/engine/classes/model/ListPaused.php
View File

@@ -115,9 +115,13 @@ class ListPaused extends BaseListPaused {
$oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']);
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if(!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -146,9 +150,13 @@ class ListPaused extends BaseListPaused {
public function update($data)
{
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if(!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
try {
$con->begin();

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

@@ -27,7 +27,9 @@ class ListUnassigned extends BaseListUnassigned
public function create($data)
{
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if(!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -56,7 +58,9 @@ class ListUnassigned extends BaseListUnassigned
public function update($data)
{
$p = new Process();
if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
if(!empty($data['PRO_UID'])) {
$data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
}
$con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
try {
$con->begin();

7
workflow/engine/classes/model/ListUnassignedGroup.php
View File

@@ -25,7 +25,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup {
public function create($data)
{
$u = new Users();
if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -52,6 +54,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup {
*/
public function update($data)
{
if(!empty($data['USR_UID'])) {
$data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
}
$con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
try {
$con->begin();