use helper methods

cconard96 · Jan 6, 2025 · 82c6cf9 · 82c6cf9
1 parent 02b8d45
commit 82c6cf9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/CommonITILObject.php b/src/CommonITILObject.php
@@ -906,10 +906,7 @@ public function canAdminActors()
      */
     public function canAssign()
     {
-        $is_closed = isset($this->fields['status']) && in_array($this->fields['status'], static::getClosedStatusArray());
-        $is_deleted = isset($this->fields['is_deleted']) && (int) $this->fields['is_deleted'] === 1;
-
-        if ($is_deleted || (!$this->isNewItem() && $is_closed)) {
+        if ($this->isDeleted() || (!$this->isNewItem() && !$this->isClosed())) {
             return false;
         }
 
@@ -3589,7 +3586,7 @@ public function isSolved(bool $include_closed = false)
         }
 
         return in_array(
-            $this->fields['status'],
+            $this->fields['status'] ?? null,
             $status
         );
     }
@@ -3604,7 +3601,7 @@ public function isSolved(bool $include_closed = false)
     public function isClosed()
     {
         return in_array(
-            $this->fields['status'],
+            $this->fields['status'] ?? null,
             $this->getClosedStatusArray()
         );
     }

diff --git a/src/Ticket.php b/src/Ticket.php
@@ -185,10 +185,7 @@ public static function getAdditionalMenuLinks()
 
     public function canAssign()
     {
-        $is_closed = isset($this->fields['status']) && in_array($this->fields['status'], static::getClosedStatusArray());
-        $is_deleted = isset($this->fields['is_deleted']) && (int) $this->fields['is_deleted'] === 1;
-
-        if ($is_deleted || (!$this->isNewItem() && $is_closed)) {
+        if ($this->isDeleted() || (!$this->isNewItem() && !$this->isClosed())) {
             return false;
         }
         return Session::haveRight(static::$rightname, self::ASSIGN);