Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Models/Group.php

@@ -76,28 +76,32 @@ public function adminuser()
      *
      * @author A. Gianotto <[email protected]>
      * @since [v1.0]
-     * @return array
+     * @return array | \stdClass
      */
     public function decodePermissions()
     {
-        // Set default to empty JSON if the value is null
+        // If the permissions are an array, convert it to JSON
         if (is_array($this->permissions)) {
             $this->permissions = json_encode($this->permissions);
         }
-        $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
 
-        // If there are no permissions, return an empty array
-        if (!$permissions) {
-            return [];
-        }
+        $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
 
         // Otherwise, loop through the permissions and cast the values as integers
-        foreach ($permissions as $permission => $value) {
-            $permissions[$permission] = (int) $value;
+        if ((is_array($permissions)) && ($permissions)) {
+            foreach ($permissions as $permission => $value) {
+
+                if (!is_integer($permission)) {
+                    $permissions[$permission] = (int) $value;
+                } else {
+                    \Log::info('Weird data here - skipping it');
+                    unset($permissions[$permission]);
+                }
+            }
+            return $permissions ?: new \stdClass;
         }
+        return new \stdClass;
 
-
-        return $permissions;
     }
 
     /**

app/Models/User.php

@@ -746,24 +746,36 @@ public function createdBy()
     }
 
 
-
+    /**
+     * Decode JSON permissions into array
+     *
+     * @author A. Gianotto <[email protected]>
+     * @since [v1.0]
+     * @return array | \stdClass
+     */
     public function decodePermissions()
     {
-        // Set default to empty JSON if the value is null
-        $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
-
-        // If there are no permissions, return an empty array
-        if (!$permissions) {
-            return [];
+        // If the permissions are an array, convert it to JSON
+        if (is_array($this->permissions)) {
+            $this->permissions = json_encode($this->permissions);
         }
 
+        $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
+
         // Otherwise, loop through the permissions and cast the values as integers
-        foreach ($permissions as $permission => $value) {
-            $permissions[$permission] = (int) $value;
+        if ((is_array($permissions)) && ($permissions)) {
+            foreach ($permissions as $permission => $value) {
+
+                if (!is_integer($permission)) {
+                    $permissions[$permission] = (int) $value;
+                } else {
+                    \Log::info('Weird data here - skipping it');
+                    unset($permissions[$permission]);
+                }
+            }
+            return $permissions ?: new \stdClass;
         }
-
-
-        return $permissions;
+        return new \stdClass;
     }
 
     /**

resources/views/groups/index.blade.php

@@ -44,7 +44,8 @@ class="table table-striped snipe-table"
                <th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
                <th data-switchable="true" data-sortable="true" data-field="name" data-formatter="groupsAdminLinkFormatter" data-visible="true">{{ trans('admin/groups/table.name') }}</th>
                   <th data-switchable="true" data-sortable="true" data-field="users_count" data-visible="true"><x-icon type="user" /><span class="sr-only">{{ trans('admin/groups/table.users') }}</span></th>
-               <th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true" data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th>
+                  <th data-switchable="true" data-sortable="true" data-field="notes" data-visible="true">{{ trans('general.notes') }}</th>
+                  <th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true" data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th>
                <th data-switchable="false" data-searchable="false" data-sortable="true" data-field="created_by"  data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
                <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions"   data-formatter="groupsActionsFormatter">{{ trans('table.actions') }}</th>