Fix tests

snipe · snipe · commit 78530ae123ae · 2018-07-09T21:57:45.000-07:00
diff --git a/app/Http/Traits/UniqueSerialTrait.php b/app/Http/Traits/UniqueSerialTrait.php
@@ -13,11 +13,10 @@ trait UniqueSerialTrait
      */
     protected function prepareUniqueSerialRule($parameters, $field)
     {
-        $settings = \App\Models\Setting::first();
-
-        if ($settings->unique_serial=='1') {
-            return 'unique_undeleted:'.$this->table.','. $this->getKey();
+        if ($settings = \App\Models\Setting::first()) {
+            if ($settings->unique_serial=='1') {
+                return 'unique_undeleted:'.$this->table.','. $this->getKey();
+            }
         }
-
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,10 @@ trait UniqueSerialTrait`
`13`	`13`	`*/`
`14`	`14`	`protected function prepareUniqueSerialRule($parameters, $field)`
`15`	`15`	`{`
`16`		`- $settings = \App\Models\Setting::first();`
`17`		`-`
`18`		`- if ($settings->unique_serial=='1') {`
`19`		`- return 'unique_undeleted:'.$this->table.','. $this->getKey();`
	`16`	`+ if ($settings = \App\Models\Setting::first()) {`
	`17`	`+ if ($settings->unique_serial=='1') {`
	`18`	`+ return 'unique_undeleted:'.$this->table.','. $this->getKey();`
	`19`	`+ }`
`20`	`20`	`}`
`21`		`-`
`22`	`21`	`}`
`23`	`22`	`}`