automatic status - fixed #5281

glpi-project · Apr 20, 2015 · ab7ec71 · ab7ec71
1 parent f142a2e
commit ab7ec71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/inc/commonitilactor.class.php b/inc/commonitilactor.class.php
@@ -346,8 +346,8 @@ 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
-                && in_array(CommonITILObject::ASSIGNED, $item->getAllStatusArray())) {
+            if (($item->fields["status"] == CommonITILObject::INCOMING)
+                && 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
@@ -723,7 +723,7 @@ function prepareInputForUpdate($input) {
                              && in_array($this->fields['status'], $this->getNewStatusArray()))
                             || (isset($input['status'])
                                 && in_array($input['status'], $this->getNewStatusArray()))) {
-                           if (in_array(self::ASSIGNED, $this->getAllStatusArray())) {
+                           if (in_array(self::ASSIGNED, array_keys($this->getAllStatusArray()))) {
                               $input['status'] = self::ASSIGNED;
                            }
                         }
@@ -745,7 +745,7 @@ function prepareInputForUpdate($input) {
                              && (in_array($this->fields['status'], $this->getNewStatusArray())))
                             || (isset($input['status'])
                                 && (in_array($input['status'], $this->getNewStatusArray())))) {
-                           if (in_array(self::ASSIGNED, $this->getAllStatusArray())) {
+                           if (in_array(self::ASSIGNED, array_keys($this->getAllStatusArray()))) {
                               $input['status'] = self::ASSIGNED;
                            }
                         }
@@ -766,7 +766,7 @@ function prepareInputForUpdate($input) {
                              && (in_array($this->fields['status'], $this->getNewStatusArray())))
                             || (isset($input['status'])
                                 && (in_array($input['status'], $this->getNewStatusArray())))) {
-                           if (in_array(self::ASSIGNED, $this->getAllStatusArray())) {
+                           if (in_array(self::ASSIGNED, array_keys($this->getAllStatusArray()))) {
                               $input['status'] = self::ASSIGNED;
                            }