From c3aade6ec3a9fc2445a458e35e572c70f7e8df7e Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 6 Apr 2015 11:35:09 -0400 Subject: [PATCH 1/2] I solved the issue PM-2076 Config PKI in Preferences by user --- workflow/engine/classes/model/UsersProperties.php | 6 ++++++ workflow/engine/methods/users/usersAjax.php | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/model/UsersProperties.php b/workflow/engine/classes/model/UsersProperties.php index 6ece46e96..b4a59119e 100755 --- a/workflow/engine/classes/model/UsersProperties.php +++ b/workflow/engine/classes/model/UsersProperties.php @@ -433,6 +433,12 @@ class UsersProperties extends BaseUsersProperties $url = 'dashboard/main'; } break; + case 'PM_STRATEGIC_DASHBOARD': + $licensedFeatures = & PMLicensedFeatures::getSingleton(); + if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') && $RBAC->userCanAccess( 'PM_SETUP' ) == 1) { + $url = 'strategicDashboard/main'; + } + break; } } diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index a325ee523..8d0fdf9b5 100755 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -158,7 +158,10 @@ switch ($_POST['action']) { $lastName = $form['USR_LASTNAME'] ? " - Last Name: ". $form['USR_LASTNAME'] : ""; $email = $form['USR_EMAIL'] ? " - Email: ". $form['USR_EMAIL'] : ""; $dueDate = $form['USR_DUE_DATE'] ? " - Due Date: ". $form['USR_DUE_DATE'] : ""; - $status = $form['USR_STATUS'] ? " - Status: ". $form['USR_STATUS'] : ""; + $status = ""; + if(isset($form['USR_STATUS'])){ + $status = $form['USR_STATUS'] ? " - Status: ". $form['USR_STATUS'] : ""; + } $address = $form['USR_ADDRESS'] ? " - Address: ". $form['USR_ADDRESS'] : ""; $phone = $form['USR_PHONE'] ? " - Phone: ". $form['USR_PHONE'] : ""; $zipCode = $form['USR_ZIP_CODE'] ? " - Zip Code: ". $form['USR_ZIP_CODE'] : ""; @@ -595,6 +598,14 @@ switch ($_POST['action']) { case 'PM_DASHBOARD': $rows[] = Array('id' => 'PM_DASHBOARD', 'name' => strtoupper(G::LoadTranslation('ID_DASHBOARD')) ); + /*----------------------------------********---------------------------------*/ + // NEW DASHBOARD MODULE + $licensedFeatures = & PMLicensedFeatures::getSingleton(); + if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) { + $rows[] = Array('id' => 'PM_STRATEGIC_DASHBOARD', 'name' => strtoupper(G::LoadTranslation('ID_STRATEGIC_DASHBOARD')) + ); + } + /*----------------------------------********---------------------------------*/ break; } } From 0d7da82d23dc37c27bd97cac6531d3ae4c41b6ef Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 6 Apr 2015 11:45:30 -0400 Subject: [PATCH 2/2] I added some marcas --- workflow/engine/classes/model/UsersProperties.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/engine/classes/model/UsersProperties.php b/workflow/engine/classes/model/UsersProperties.php index b4a59119e..0187fb8fa 100755 --- a/workflow/engine/classes/model/UsersProperties.php +++ b/workflow/engine/classes/model/UsersProperties.php @@ -433,12 +433,14 @@ class UsersProperties extends BaseUsersProperties $url = 'dashboard/main'; } break; + /*----------------------------------********---------------------------------*/ case 'PM_STRATEGIC_DASHBOARD': $licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') && $RBAC->userCanAccess( 'PM_SETUP' ) == 1) { $url = 'strategicDashboard/main'; } break; + /*----------------------------------********---------------------------------*/ } }