diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index 2e4353620..90f4a1d82 100755 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -62,6 +62,8 @@ class Applications $oAppCache->confCasesList = $confCasesList; } + $delimiter = DBAdapter::getStringDelimiter(); + // get the action based list switch ($action) { case "draft": @@ -185,14 +187,25 @@ class Applications $CriteriaCount->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' ); //Current delegation - if ($action == "to_reassign") { - $Criteria->addAsColumn("APPCVCR_APP_TAS_TITLE", "APP_CACHE_VIEW.APP_TAS_TITLE"); - $CriteriaCount->addAsColumn("APPCVCR_APP_TAS_TITLE", "APP_CACHE_VIEW.APP_TAS_TITLE"); - } else { - $Criteria->addAsColumn("APPCVCR_APP_TAS_TITLE", "APPCVCR.APP_TAS_TITLE"); - $CriteriaCount->addAsColumn("APPCVCR_APP_TAS_TITLE", "APPCVCR.APP_TAS_TITLE"); + $appdelcrTableName = AppCacheViewPeer::TABLE_NAME; + $appdelcrAppTasTitle = "APPDELCR.APP_TAS_TITLE"; + $appdelcrAppTasTitleCount = $appdelcrAppTasTitle; + + switch ($action) { + case "sent": + $appdelcrTableName = AppDelegationPeer::TABLE_NAME; + $appdelcrAppTasTitle = "(SELECT CON_VALUE FROM CONTENT WHERE CON_ID = APPDELCR.TAS_UID AND CON_LANG = " . $delimiter . SYS_LANG . $delimiter . " AND CON_CATEGORY = " . $delimiter . "TAS_TITLE" . $delimiter . ")"; + $appdelcrAppTasTitleCount = "APPDELCR.TAS_UID"; + break; + case "to_reassign": + $appdelcrAppTasTitle = "APP_CACHE_VIEW.APP_TAS_TITLE"; + $appdelcrAppTasTitleCount = $appdelcrAppTasTitle; + break; } + $Criteria->addAsColumn("APPDELCR_APP_TAS_TITLE", $appdelcrAppTasTitle); + $CriteriaCount->addAsColumn("APPDELCR_APP_TAS_TITLE", $appdelcrAppTasTitleCount); + $Criteria->addAsColumn("USRCR_USR_UID", "USRCR.USR_UID"); $Criteria->addAsColumn("USRCR_USR_FIRSTNAME", "USRCR.USR_FIRSTNAME"); $Criteria->addAsColumn("USRCR_USR_LASTNAME", "USRCR.USR_LASTNAME"); @@ -203,20 +216,20 @@ class Applications $CriteriaCount->addAsColumn("USRCR_USR_LASTNAME", "USRCR.USR_LASTNAME"); $CriteriaCount->addAsColumn("USRCR_USR_USERNAME", "USRCR.USR_USERNAME"); - $Criteria->addAlias("APPCVCR", AppCacheViewPeer::TABLE_NAME); + $Criteria->addAlias("APPDELCR", $appdelcrTableName); $Criteria->addAlias("USRCR", UsersPeer::TABLE_NAME); - $CriteriaCount->addAlias("APPCVCR", AppCacheViewPeer::TABLE_NAME); + $CriteriaCount->addAlias("APPDELCR", $appdelcrTableName); $CriteriaCount->addAlias("USRCR", UsersPeer::TABLE_NAME); $arrayCondition = array(); - $arrayCondition[] = array(AppCacheViewPeer::APP_UID, "APPCVCR.APP_UID"); - $arrayCondition[] = array("APPCVCR.DEL_LAST_INDEX", 1); + $arrayCondition[] = array(AppCacheViewPeer::APP_UID, "APPDELCR.APP_UID"); + $arrayCondition[] = array("APPDELCR.DEL_LAST_INDEX", 1); $Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); $CriteriaCount->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); $arrayCondition = array(); - $arrayCondition[] = array("APPCVCR.USR_UID", "USRCR.USR_UID"); + $arrayCondition[] = array("APPDELCR.USR_UID", "USRCR.USR_UID"); $Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); $CriteriaCount->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); @@ -467,7 +480,7 @@ class Applications $sort = "USRCR_" . $conf->userNameFormatGetFirstFieldByUsersTable(); break; case "APP_CACHE_VIEW.APP_TAS_TITLE": - $sort = "APPCVCR_APP_TAS_TITLE"; + $sort = "APPDELCR_APP_TAS_TITLE"; break; } } @@ -568,7 +581,7 @@ class Applications //Current delegation (*) || $action == "search" || $action == "to_revise" if (($action == "sent" || $action == "simple_search" || $action == "to_reassign") && ($status != "TO_DO")) { //Current task - $aRow["APP_TAS_TITLE"] = $aRow["APPCVCR_APP_TAS_TITLE"]; + $aRow["APP_TAS_TITLE"] = $aRow["APPDELCR_APP_TAS_TITLE"]; //Current user //if ($action != "to_reassign" ) {