update

phambinh217 · Feb 10, 2017 · 06acf71 · 06acf71
1 parent 1800077
commit 06acf71
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/publishes/config/cms.php b/publishes/config/cms.php
@@ -2,9 +2,9 @@
 
 return [
     'dashboard-view-path'    =>    'Admin::admin.dashboard',
-    'thumbnail-default' => '<yourdomain>/uploads/no-product-image.png',
+    'default-thumbnail' => '<yourdomain>/uploads/no-product-image.png',
     'default-avatar' => '<yourdomain>/uploads/avatars/no-avatar.jpg',
-    'default-icon' => '<yourdomain>/uploads/icons/no-icon.png',
+    'default-icon' => '<yourdomain>/public/uploads/icons/no-icon.png',
 
     'providers' => [
         /**

diff --git a/src/Mail/src/Models/Mail.php b/src/Mail/src/Models/Mail.php
@@ -113,7 +113,7 @@ public function avatarOrDefault()
             return $this->avatar;
         }
 
-        return setting('default-avatar');
+        return setting('default-avatar', config('cms.default-avatar'));
     }
 
     /**

diff --git a/src/User/resources/views/admin/components/form-find-user.blade.php b/src/User/resources/views/admin/components/form-find-user.blade.php
@@ -17,7 +17,7 @@
 			var user = new findUser({
 				el: '.find-user',
 				url: '{{ api_url('v1/user') }}',
-				defaultAvatar: '{{ setting('default-avatar') }}',
+				defaultAvatar: '{{ setting('default-avatar', config('cms.default-avatar')) }}',
 				placeholder: 'Tìm kiếm',
 			});
 		});

diff --git a/src/User/src/Models/User.php b/src/User/src/Models/User.php
@@ -287,6 +287,6 @@ public function avatarOrDefault()
             return $this->avatar;
         }
 
-        return setting('default-avatar');
+        return setting('default-avatar', config('cms.default-avatar'));
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,7 @@ public function avatarOrDefault() @@
                 return $this->avatar;
             }
-            return setting('default-avatar');
+            return setting('default-avatar', config('cms.default-avatar'));
         }
         /**
@@ Expand Down @@