Merge remote-tracking branch 'origin/develop'

snipe · Nov 22, 2023 · 10d867c · 10d867c
2 parents f12efcf + eae98d3
commit 10d867c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
@@ -534,8 +534,10 @@ public function selectlist(Request $request)
      * @since [v4.0]
      * @return \Illuminate\Http\JsonResponse
      */
-    public function store(StoreAssetRequest $request)
+    public function store(ImageUploadRequest $request)
     {
+        return Gate::allows('create', new Asset);
+
         $asset = new Asset();
         $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
 

diff --git a/app/Models/Category.php b/app/Models/Category.php
@@ -247,6 +247,26 @@ public function getEula()
         }
     }
 
+    /**
+     * -----------------------------------------------
+     * BEGIN MUTATORS
+     * -----------------------------------------------
+     **/
+
+    /**
+     * This sets the checkin_value to a boolean 0 or 1. This accounts for forms or API calls that
+     * explicitly pass the checkin_email field but it has a null or empty value.
+     *
+     * This will also correctly parse a 1/0 if "true"/"false" is passed.
+     *
+     * @param $value
+     * @return void
+     */
+    public function setCheckinEmailAttribute($value)
+    {
+        $this->attributes['checkin_email'] = (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
+    }
+
     /**
      * -----------------------------------------------
      * BEGIN QUERY SCOPES