Should fix rule, category and other name checks. firefly-iii#793

Findus23 · Sep 1, 2017 · ffaf48d · ffaf48d
1 parent 2915fae
commit ffaf48d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
@@ -28,7 +28,7 @@
 class Bill extends Model
 {
 
-    use ValidatingTrait;
+    use SoftDeletes, ValidatingTrait;
     /**
      * The attributes that should be casted to native types.
      *

diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
@@ -387,7 +387,7 @@ public function validateUniqueObjectForUser($attribute, $value, $parameters): bo
         $exclude = $parameters[2] ?? 0;
 
         // get entries from table
-        $set = DB::table($table)->where('user_id', auth()->user()->id)
+        $set = DB::table($table)->where('user_id', auth()->user()->id)->whereNull('deleted_at')
                  ->where('id', '!=', $exclude)->get([$field]);
 
         foreach ($set as $entry) {