Fix media type setting's logical problem

darron1217 · darron1217 · commit c16858eea209 · 2018-04-19T14:13:07.000+09:00
diff --git a/Modules/Setting/Entities/Setting.php b/Modules/Setting/Entities/Setting.php
@@ -14,9 +14,9 @@ class Setting extends Model
     protected $fillable = ['name', 'value', 'description', 'isTranslatable', 'plainValue'];
     protected $table = 'setting__settings';
 
-    public function hasMedia(): bool
+    public function isMedia(): bool
     {
         $value = json_decode($this->plainValue, true);
-        return is_array($value) && isset($value['media_single']) && $setting->files->count();
+        return is_array($value) && isset($value['media_single']);
     }
 }
diff --git a/Modules/Setting/Support/Settings.php b/Modules/Setting/Support/Settings.php
@@ -36,7 +36,7 @@ public function get($name, $locale = null, $default = null)
             return is_null($default) ? $defaultFromConfig : $default;
         }
 
-        if($setting->hasMedia() && $media = $setting->files->first()) {
+        if($setting->isMedia() && $media = $setting->files()->first()) {
             return $media->path;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ class Setting extends Model`
`14`	`14`	`protected $fillable = ['name', 'value', 'description', 'isTranslatable', 'plainValue'];`
`15`	`15`	`protected $table = 'setting__settings';`
`16`	`16`
`17`		`- public function hasMedia(): bool`
	`17`	`+ public function isMedia(): bool`
`18`	`18`	`{`
`19`	`19`	`$value = json_decode($this->plainValue, true);`
`20`		`- return is_array($value) && isset($value['media_single']) && $setting->files->count();`
	`20`	`+ return is_array($value) && isset($value['media_single']);`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function get($name, $locale = null, $default = null)`
`36`	`36`	`return is_null($default) ? $defaultFromConfig : $default;`
`37`	`37`	`}`
`38`	`38`
`39`		`- if($setting->hasMedia() && $media = $setting->files->first()) {`
	`39`	`+ if($setting->isMedia() && $media = $setting->files()->first()) {`
`40`	`40`	`return $media->path;`
`41`	`41`	`}`
`42`	`42`