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

remove DEPO_TITLE

Browse Source
This commit is contained in:
Ronald Q
2016-06-29 12:07:16 -04:00
parent 5c79eb30da
commit 6a82ca3e96
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmDashlet.php
View File

@@ -132,7 +132,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
$departmentInstance = new Department();
try {
$department = $departmentInstance->load( $row['DAS_INS_OWNER_UID'] );
$row['DAS_INS_OWNER_TITLE'] = $department['DEPO_TITLE'];
$row['DAS_INS_OWNER_TITLE'] = $department['DEP_TITLE'];
} catch (Exception $error) {
$this->remove( $row['DAS_INS_UID'] );
$row['DAS_INS_UID'] = '';

3
workflow/engine/classes/model/Department.php
View File

@@ -190,7 +190,6 @@ class Department extends BaseDepartment
if (is_object( $oDept ) && get_class( $oDept ) == 'Department') {
$aFields = $oDept->toArray( BasePeer::TYPE_FIELDNAME );
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
//$aFields['DEPO_TITLE'] = $oDept->getDepTitle();
return $aFields;
} else {
throw (new Exception( "The row '$DepUid' in table Department doesn't exist!" ));
@@ -293,7 +292,7 @@ class Department extends BaseDepartment
Content::removeContent( 'DEPO_TITLE', '', $oPro->getDepUid() );
Content::removeContent( 'DEPO_DESCRIPTION', '', $oPro->getDepUid() );
G::auditLog("DeleteDepartament", "Departament Name: ".$dptoTitle['DEPO_TITLE']." Departament ID: (".$oPro->getDepUid().") ");
G::auditLog("DeleteDepartament", "Departament Name: ".$dptoTitle['DEP_TITLE']." Departament ID: (".$oPro->getDepUid().") ");
return $oPro->delete();
} else {
throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));

4
workflow/engine/methods/departments/departments_Ajax.php
View File

@@ -72,7 +72,7 @@ switch ($_POST['action']) {
case 'showUsers':
global $G_PUBLISH;
$oDept = new Department();
$aFields = $oDept->load( $_POST['sDptoUID'] );
$aFields = $oDept->Load( $_POST['sDptoUID'] );
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'departments/departments_Edit', '', $aFields, '' );
@@ -82,7 +82,7 @@ switch ($_POST['action']) {
//$G_PUBLISH->AddContent('propeltable', 'paged-table', 'departments/departments_UsersList', $criteria, $aFields);
$oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addScriptCode( "groupname='{$aFields["DEPO_TITLE"]}';" );
$oHeadPublisher->addScriptCode( "groupname='{$aFields["DEP_TITLE"]}';" );
$oHeadPublisher->addScriptCode( "depUid='{$aFields["DEP_UID"]}';" );
G::RenderPage( 'publish', 'raw' );

8
workflow/engine/methods/users/myInfo_Edit.php
View File

@@ -55,8 +55,8 @@ try {
$userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
try {
$depFields = $oDepInfo->load( $userFields['DEP_UID'] . 'xy<' );
$aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEPO_TITLE'] . ")";
$depFields = $oDepInfo->Load( $userFields['DEP_UID'] . 'xy<' );
$aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEP_TITLE'] . ")";
} catch (Exception $e) {
}
} else {
@@ -64,8 +64,8 @@ try {
}
try {
$depFields = $oDepInfo->load( $aFields['DEP_UID'] );
$aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE'];
$depFields = $oDepInfo->Load( $aFields['DEP_UID'] );
$aFields['USR_DEPARTMENT'] = $depFields['DEP_TITLE'];
} catch (Exception $e) {
$oUser = UsersPeer::retrieveByPk( $_SESSION['USER_LOGGED'] );
$oUser->setDepUid( '' );

8
workflow/engine/methods/users/users_Edit.php
View File

@@ -62,8 +62,8 @@ try {
$userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
try {
$depFields = $oDepInfo->load( $userFields['DEP_UID'] );
$aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEPO_TITLE'] . ")";
$depFields = $oDepInfo->Load( $userFields['DEP_UID'] );
$aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEP_TITLE'] . ")";
} catch (Exception $e) {
}
} else {
@@ -71,8 +71,8 @@ try {
}
try {
$depFields = $oDepInfo->load( $aFields['DEP_UID'] );
$aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE'];
$depFields = $oDepInfo->Load( $aFields['DEP_UID'] );
$aFields['USR_DEPARTMENT'] = $depFields['DEP_TITLE'];
} catch (Exception $e) {
$oUser = UsersPeer::retrieveByPk( $_GET['USR_UID'] );
$oUser->setDepUid( '' );