fix automatic change os status - fixed #5301

glpi-project · May 22, 2015 · 5154a63 · 5154a63
1 parent 2231097
commit 5154a63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/inc/commonitilactor.class.php b/inc/commonitilactor.class.php
@@ -346,7 +346,7 @@ function post_addItem() {
       // Check object status and update it if needed
       if (!isset($this->input['_from_object'])) {
          if ($item->getFromDB($this->fields[static::getItilObjectForeignKey()])) {
-            if (($item->fields["status"] == CommonITILObject::INCOMING)
+            if (in_array($item->fields["status"], $item->getNewStatusArray())
                 && in_array(CommonITILObject::ASSIGNED, array_keys($item->getAllStatusArray()))) {
                $item->update(array('id'     => $item->getID(),
                                    'status' => CommonITILObject::ASSIGNED));

diff --git a/inc/commonitilobject.class.php b/inc/commonitilobject.class.php
@@ -871,7 +871,13 @@ function pre_updateInDB() {
                $this->oldvalues['status'] = $this->fields['status'];
                $this->updates[] = 'status';
             }
+
             $this->fields['status'] = self::INCOMING;
+            // Don't change status if it's a new status allow
+            if (in_array($this->oldvalues['status'], $this->getNewStatusArray())) {
+               $this->fields['status'] = $this->oldvalues['status'];
+
+            }
          }
 
          if (in_array("status", $this->updates)