diff --git a/workflow/engine/classes/model/AppEvent.php b/workflow/engine/classes/model/AppEvent.php index 1f51d5137..8e0d1f4d1 100755 --- a/workflow/engine/classes/model/AppEvent.php +++ b/workflow/engine/classes/model/AppEvent.php @@ -125,9 +125,9 @@ class AppEvent extends BaseAppEvent $oCriteria->addSelectColumn( EventPeer::PRO_UID ); $oCriteria->addSelectColumn( EventPeer::EVN_WHEN_OCCURS ); $oCriteria->addSelectColumn( EventPeer::EVN_ACTION ); + $oCriteria->addSelectColumn( ApplicationPeer::APP_TITLE ); $oCriteria->addAsColumn( 'EVN_DESCRIPTION', 'C1.CON_VALUE' ); $oCriteria->addAsColumn( 'TAS_TITLE', 'C2.CON_VALUE' ); - $oCriteria->addAsColumn( 'APP_TITLE', 'C3.CON_VALUE' ); $oCriteria->addAsColumn( 'PRO_TITLE', 'C4.CON_VALUE' ); $oCriteria->addAlias( 'C1', 'CONTENT' ); $oCriteria->addAlias( 'C2', 'CONTENT' ); @@ -157,14 +157,7 @@ class AppEvent extends BaseAppEvent $aConditions[] = array ('C2.CON_LANG',$del . SYS_LANG . $del ); $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); - $aConditions = array (); - $aConditions[] = array (AppDelegationPeer::APP_UID,'C3.CON_ID' - ); - $aConditions[] = array ('C3.CON_CATEGORY',$del . 'APP_TITLE' . $del - ); - $aConditions[] = array ('C3.CON_LANG',$del . SYS_LANG . $del - ); - $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); + $oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN); $aConditions = array (); $aConditions[] = array (AppDelegationPeer::PRO_UID,'C4.CON_ID' ); diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index bdd257839..9ecdd0712 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -25,15 +25,13 @@ class ListCanceled extends BaseListCanceled { public function create($data) { $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); + $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_TITLE'] = $aRow['CON_VALUE']; + $data['APP_TITLE'] = $aRow['APP_TITLE']; $criteria = new Criteria(); $criteria->addSelectColumn(ContentPeer::CON_VALUE); diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index b16026c8a..39f353a84 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -35,15 +35,13 @@ class ListCompleted extends BaseListCompleted } $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); + $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_TITLE'] = $aRow['CON_VALUE']; + $data['APP_TITLE'] = $aRow['APP_TITLE']; $criteria = new Criteria(); diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 7ae10ec38..60be556db 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -25,15 +25,13 @@ class ListPaused extends BaseListPaused { public function create($data) { $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); + $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_TITLE'] = $aRow['CON_VALUE']; + $data['APP_TITLE'] = $aRow['APP_TITLE']; $criteria = new Criteria(); $criteria->addSelectColumn(ContentPeer::CON_VALUE); diff --git a/workflow/engine/methods/setup/language_Ajax.php b/workflow/engine/methods/setup/language_Ajax.php index fad0d0b42..b322c4352 100755 --- a/workflow/engine/methods/setup/language_Ajax.php +++ b/workflow/engine/methods/setup/language_Ajax.php @@ -147,16 +147,13 @@ try { $oCriteria = new Criteria( 'workflow' ); //$oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')'); - $oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY ); - $oCriteria->addSelectColumn( ContentPeer::CON_VALUE ); - $oCriteria->add( ContentPeer::CON_LANG, $locale ); - $oCriteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); - $oDataset = ContentPeer::doSelectRS( $oCriteria ); - + $oCriteria->addSelectColumn(ApplicationPeer::APP_TITLE); + $oDataset = ApplicationPeer::doSelectRS( $oCriteria ); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); - $oContent = new Content(); $aRow = $oDataset->getRow(); + $oContent = new Content(); if($locale != "en"){ //Default Lengage 'en' if($locale != SYS_LANG){ //Current lenguage //THERE IS NO ANY CASE STARTED FROM THES LANGUAGE