Merge pull request #52 from systeminc/development

Stable release to production

Author: MladenJanjetovic

README.md

@@ -44,13 +44,19 @@ Start package installation by running instal command below:
 php artisan laravel-admin:instal
 ```
 
+If our package update throws composer, please update dependency running commend below:
+
+```php
+php artisan laravel-admin:update
+```
+
 Note that this installation uses migrations, so you must run it from machine that has access to your database. 
 
 For instance, if you use Vagrant, you will have to do `vagrant ssh` first, go to your project directory, and run this instal command. The same way you run your standard Laravel's migration command. 
 
 ## Usage
 
-TODO
+Visit [wiki](https://github.com/systeminc/laravel-admin/wiki/Blog) 
 
 ## Contributing
 

src/Blog.php

@@ -24,9 +24,13 @@ public function __get($key)
      *
      * @return type
      */
-    public function posts()
+    public function posts($url_key = false)
     {
-        return new BlogPost();
+        if ($url_key) {
+            return BlogPost::whereUriId($url_key)->first();
+        } else {
+            return new BlogPost();
+        }
     }
 
     /**

src/BlogCategory.php

@@ -13,7 +13,7 @@ class BlogCategory extends Model
         'excerpt',
         'description',
         'menu_order',
-        'uri',
+        'slug',
         'seo_title',
         'seo_description',
         'seo_keywords',

src/BlogPost.php

@@ -8,7 +8,7 @@ class BlogPost extends Model
 {
     protected $fillable = [
         'blog_category_id',
-        'uri_id',
+        'slug',
         'title',
         'thumb',
         'content',

src/BlogPostComment.php

@@ -14,7 +14,7 @@ class BlogPostComment extends Model
         'approved',
     ];
 
-    public function article()
+    public function post()
     {
         return $this->belongsTo('SystemInc\LaravelAdmin\BlogPost', 'blog_post_id');
     }

src/Console/UpdateCommand.php

@@ -57,29 +57,18 @@ public function handle()
         $this->line('');
         $this->line('Updating Configuration...');
 
-        $config_changed = false;
-
-        $config = require __DIR__.'/../config/laravel-admin.php';
-        $config_file = File::get(__DIR__.'/../config/laravel-admin.php');
-
+        $package_config = require __DIR__.'/../config/laravel-admin.php';
         $client_config = require base_path('config/laravel-admin.php');
 
-        foreach (config('laravel-admin') as $key => $value) {
-            $config_file = str_replace($config[$key], $value, $config_file);
+        $replaceConfig = array_replace_recursive(require __DIR__.'/../config/laravel-admin.php', config('laravel-admin'));
 
-            //CHECK IS CONFIG MERGE WITH CLIENT
-            if (!isset($client_config[$key]) && !$config_changed) {
-                $config_changed = true;
+        foreach ($package_config as $key => $value) {
+            if (!isset($client_config[$key])) {
+                File::put(base_path('config/laravel-admin.php'), ("<?php \r\n\r\nreturn ".preg_replace(['/$([ ])/', '/[ ]([ ])/'], '	', var_export($replaceConfig, true)).';'));
+                $this->info('Config file ("config/laravel-admin.php") is merged, please see changes for new feature');
             }
         }
 
-        File::put(base_path('config/laravel-admin.php'), $config_file);
-
-        //IF CONFIG ARE MERGE WARM USER
-        if ($config_changed) {
-            $this->info('Config file ("config/laravel-admin.php") is merged, please see changes for new feature');
-        }
-
         $this->line('Updating Configuration Done!');
         $this->line('');
         $this->line('***');

src/Http/Controllers/Blog/BlogController.php

@@ -43,7 +43,7 @@ public function getPostNew(Request $request)
     {
         $post = new BlogPost();
         $post->title = 'New Article';
-        $post->uri_id = 'new-post-'.time();
+        $post->slug = 'new-post-'.time();
         $post->save();
 
         return redirect($request->segment(1).'/blog/post-edit/'.$post->id);
@@ -87,6 +87,7 @@ public function postSave(Request $request, $post_id)
             $post->thumb = null;
         }
 
+        $post->slug = str_slug($request->slug);
         $post->save();
 
         return redirect($request->segment(1).'/blog/post-edit/'.$post->id)->with('success', 'Saved successfully');

src/Http/Controllers/Blog/CategoriesController.php

@@ -89,9 +89,8 @@ public function postSave(Request $request, $category_id)
 
             $category->thumb = null;
         }
-        //REPLACE URI
-        $uri = strtolower($request->title);
-        $category->uri = str_replace(' ', '-', $uri);
+        //REPLACE slug
+        $category->slug = str_slug($request->title);
 
         $category->save();
 

src/Http/Controllers/PagesController.php

@@ -75,7 +75,7 @@ public function postSave(Request $request)
         }
 
         $page->elements_prefix = $this->sanitizeElements($request->elements_prefix);
-        $page->uri_key = $this->sanitizeUri($request->uri_key);
+        $page->slug = str_slug($request->slug);
 
         $page->save();
 
@@ -119,7 +119,7 @@ public function postUpdate(Request $request, $page_id)
         $page->fill($data);
 
         $page->elements_prefix = $elements_prefix;
-        $page->uri_key = $this->sanitizeUri($request->uri_key);
+        $page->slug = str_slug($request->slug);
 
         $page->save();
 

src/Http/Controllers/Places/LocationsController.php

@@ -75,7 +75,7 @@ public function postSave(Request $request)
             $location->map_id = null;
         }
 
-        $location->key = $this->sanitizeUri($request->key);
+        $location->key = str_slug($request->key);
         $location->save();
 
         return redirect(config('laravel-admin.route_prefix').'/places/locations')->with('success', 'Saved successfully');
@@ -119,15 +119,23 @@ public function postUpdate(Request $request, $location_id)
         $location = Location::find($location_id);
         $location->fill($data);
 
-        $location->image = $this->saveImage($request->file('image'), 'locations');
-        $location->thumb_image = $this->saveImage($request->file('thumb_image'), 'locations/thumb');
-        $location->marker_image = $this->saveImage($request->file('marker_image'), 'locations/marker');
+        if ($request->hasFile('image')) {
+            $location->image = $this->saveImage($request->file('image'), 'locations');
+        }
+
+        if ($request->hasFile('thumb_image')) {
+            $location->thumb_image = $this->saveImage($request->file('thumb_image'), 'locations/thumb');
+        }
+
+        if ($request->hasFile('marker_image')) {
+            $location->marker_image = $this->saveImage($request->file('marker_image'), 'locations/marker');
+        }
 
         if ($request->map_id == 0) {
             $location->map_id = null;
         }
 
-        $location->key = $this->sanitizeUri($request->key);
+        $location->key = str_slug($request->key);
 
         if ($request->input('delete_image')) {
             if (Storage::exists($location->image)) {