Module RequestManager, SynergiesTech: task Dolibarr#1039 - Correction…

… de l'affectation des valeurs du statut aux variables de substitutions et suppression du message sauvegarder en session si le message est correctement créé
OGPayet · Jan 6, 2021 · 6e5767f · 6e5767f
1 parent c6d10c1
commit 6e5767f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/htdocs/custom/requestmanager/card.php b/htdocs/custom/requestmanager/card.php
@@ -1206,6 +1206,7 @@
             setEventMessages($requestmanagermessage->error, $requestmanagermessage->errors, 'errors');
             $action = 'premessage';
         } else {
+            $formrequestmanagermessage->clear_datas_in_session();
             $formrequestmanagermessage->remove_all_attached_files();
             header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
             exit();

diff --git a/htdocs/custom/requestmanager/class/requestmanagersubstitutes.class.php b/htdocs/custom/requestmanager/class/requestmanagersubstitutes.class.php
@@ -258,10 +258,10 @@ static function getAvailableSubstitutesKeyFromRequest($db, $alsofornotify=0, $ke
                 '__REQUEST_DURATION__'                  => $requestmanager->duration > 0 ? requestmanager_print_duration($requestmanager->duration) : '',
                 '__REQUEST_DATE_OPERATION__'            => $requestmanager->date_operation > 0 ? dol_print_date($requestmanager->date_operation, 'dayhour') : '',
                 '__REQUEST_DATE_DEADLINE__'             => $requestmanager->date_deadline > 0 ? dol_print_date($requestmanager->date_deadline, 'dayhour') : '',
-                '__REQUEST_STATUS_NUM__'                => $requestmanager->statut > 0 ? $requestmanager->statut : $requestmanager->oldcopy->statut,
-                '__REQUEST_STATUS_LABEL__'              => $requestmanager->statut > 0 ? $requestmanager->getLibStatut(0) : $requestmanager->oldcopy->getLibStatut(0),
-                '__REQUEST_STATUS_TYPE_NUM__'           => $requestmanager->statut_type > 0 ? $requestmanager->statut_type : $requestmanager->oldcopy->statut_type,
-                '__REQUEST_STATUS_TYPE_LABEL__'         => $requestmanager->statut > 0 ? $requestmanager->getLibStatut(12) : $requestmanager->oldcopy->getLibStatut(12),
+                '__REQUEST_STATUS_NUM__'                => $requestmanager->statut,
+                '__REQUEST_STATUS_LABEL__'              => $requestmanager->getLibStatut(0),
+                '__REQUEST_STATUS_TYPE_NUM__'           => $requestmanager->statut_type,
+                '__REQUEST_STATUS_TYPE_LABEL__'         => $requestmanager->getLibStatut(12),
                 '__REQUEST_REASON_RESOLUTION_CODE__'    => $requestmanager->getLibReasonResolution(1),
                 '__REQUEST_REASON_RESOLUTION_LABEL__'   => $requestmanager->getLibReasonResolution(0),
                 '__REQUEST_REASON_RESOLUTION_DETAILS__' => $requestmanager->reason_resolution_details,
@@ -317,10 +317,10 @@ static function getAvailableSubstitutesKeyFromRequest($db, $alsofornotify=0, $ke
                 foreach ($requestmanager->assigned_usergroup_deleted_ids as $usergroup_id) { $assigned_usergroup_deleted_names[] = self::_getUserGroupName($usergroup_id); }
 
                 $vars = array_merge($vars, array(
-                    '__REQUEST_OLD_STATUS_NUM__'                    => $requestmanager->statut > 0 ? $requestmanager->oldcopy->statut : '',
-                    '__REQUEST_OLD_STATUS_LABEL__'                  => $requestmanager->statut > 0 ? $requestmanager->oldcopy->getLibStatut(0) : '',
-                    '__REQUEST_OLD_STATUS_TYPE_NUM__'               => $requestmanager->statut_type > 0 ? $requestmanager->oldcopy->statut_type : '',
-                    '__REQUEST_OLD_STATUS_TYPE_LABEL__'             => $requestmanager->new_statut > 0 ? $requestmanager->oldcopy->getLibStatut(12) : '',
+                    '__REQUEST_OLD_STATUS_NUM__'                    => is_object($requestmanager->oldcopy) ? $requestmanager->oldcopy->statut : '',
+                    '__REQUEST_OLD_STATUS_LABEL__'                  => is_object($requestmanager->oldcopy) ? $requestmanager->oldcopy->getLibStatut(0) : '',
+                    '__REQUEST_OLD_STATUS_TYPE_NUM__'               => is_object($requestmanager->oldcopy) ? $requestmanager->oldcopy->statut_type : '',
+                    '__REQUEST_OLD_STATUS_TYPE_LABEL__'             => is_object($requestmanager->oldcopy) ? $requestmanager->oldcopy->getLibStatut(12) : '',
                     '__REQUEST_ASSIGNED_USERS_ID_ADDED__'           => implode(', ', $requestmanager->assigned_user_added_ids),
                     '__REQUEST_ASSIGNED_USERS_NAME_ADDED__'         => implode(', ', $assigned_user_added_names),
                     '__REQUEST_ASSIGNED_USERS_ID_DELETED__'         => implode(', ', $requestmanager->assigned_user_deleted_ids),

diff --git a/htdocs/custom/synergiestech/class/actions_synergiestech.class.php b/htdocs/custom/synergiestech/class/actions_synergiestech.class.php
@@ -1213,6 +1213,7 @@ function doActions($parameters, &$object, &$action, $hookmanager)
                     $this->db->rollback();
                     $action = 'stpremessage';
                 } else {
+                    $formrequestmanagermessage->clear_datas_in_session();
                     $formrequestmanagermessage->remove_all_attached_files();
                     $this->db->commit();
                     header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);