Merge pull request #18 from JohannLai/dev

Fixed some bug

Author: JohannLai

dnf/app/Http/Controllers/Backend/Blog/CategoryController.php

@@ -71,8 +71,8 @@ public function updateCategory(CategoryRequest $request)
      */
      public function deleteCategory()
      {
-        $id = Input::get('id',false);
-        if($id==1)return Js::error(Lang::get('params.10007'));
+         $id = Input::get('id',false);
+        //if($id==1)return Js::error(Lang::get('params.10007'));
 
         $category = CategoryModel::find($id);
         if(!$category)return Js::response(Lang::get('params.10005',false));
@@ -88,6 +88,7 @@ public function deleteCategory()
         foreach($article_ids as $article_id){
             $article = ArticleModel::where('id','=',$article_id)->delete();
         };
+
         CategoryModel::deleteById($id);
         ActionModel::createOneAction('16',$category->category);
         return Js::response(null,true,false);

dnf/app/Http/Controllers/Backend/Product/ProductController.php

@@ -29,6 +29,15 @@ public function __construct()
 	$user = Auth::id();
     }
 
+
+    public function getProduct()
+    {
+        $datas = ProductModel::all();
+        return view('backend.product.index', compact('datas'));
+    }
+
+
+
    /**
      * 页面 ：产品添加页面
      * @return Response
@@ -58,19 +67,6 @@ public function update()
 
 
 
-    /**
-     * 页面：产品列表
-     * @return Response
-     */
-     public function getProduct()
-     {
-        $datas = ProductModel::all();
-
-        return view('backend.product.index', [
-            'datas' => $datas,
-        ]);
-     }
-
 
 
 

dnf/app/Http/Requests/ArticleRequest.php

@@ -25,15 +25,14 @@ public function authorize()
 	public function rules()
              {
 		return [
-		           'title'=> "required|between:1,20",
+		           'title'=> "required|between:1,50",
 		           'author'=> 'required|between:1,15',
 		            'category_id'=>'required',
 		            'description' => 'required',
 		            'tag_id' => 'required',
 		            'source'=> 'required|between:1,60',
 		            'description' => 'required',
-	 	            'img_URL'=>'URL',
-	                         'content'=>'required',
+	                'content'=>'required',
 		];
 	}
 
@@ -54,10 +53,10 @@ public function messages()
 	            'category_id.required'=>$rules['required']['category_id'],
 	            'tag_id.required'=> $rules['required']['tag_id'],
 	            'description.required'=>$rules['required']['description'],
-	            'img_URL.url'=> $rules['URL'],
+	            'img_URL.url'=> $rules['required'],
 	            'source.required'=> $rules['required']['source'],
-	    	'source.between'=>$rules['between']['source'].':min ~ :max',
-                          'content.required' => $rules['required']['content'],
+	          	'source.between'=>$rules['between']['source'].':min ~ :max',
+                'content.required' => $rules['required']['content'],
         ];
 	}
 

dnf/app/Http/routes.php

@@ -549,19 +549,21 @@
 
 Route::group(array('prefix' => 'product'),function () {
            #页面:  产品案例列表
-           route::get('/',array(
-                   'as'=> 'backend_product_product_index',
-           'uses'=>'Backend\Product\ProductController@getProduct'
+           Route::get('/index',array(
+            'as'=> 'backend_product_product_index',
+            'uses'=>'Backend\Product\ProductController@getProduct'
            ));
            #页面:   新建产品案例
+
+
            Route::get('/create',array(
             'as'=> 'backend_product_product_create',
             'uses'=>'Backend\Product\ProductController@_create'
            ));
 
            # 产品案例发表
            Route::post('/create',array(
-            'as' => 'backend_blog_articles_create',
+            'as' => 'backend_product_product_create',
             'uses' => 'Backend\Product\ProductController@createProduct'
            ));
 

dnf/app/Models/Backend/blog/Category.php

@@ -25,7 +25,7 @@ class Category extends BaseModel{
 
    public static function deleteById($id)
    {
-        return static::delete($id);
+        return static::destroy($id);
    }
 
 /*

dnf/app/Models/Backend/product/Product.php

@@ -11,7 +11,7 @@ class Product extends BaseModel {
      */
     use SoftDeletes;
     protected $dates = ['deleted_at'];
-  
+
 
    protected $table = 'product';
 

dnf/config/database.php

@@ -55,9 +55,9 @@
 		'mysql' => [
 			'driver'    => 'mysql',
 			'host'      => env('DB_HOST', 'localhost'),
-			'database'  => env('DB_DATABASE', 'forge'),
-			'username'  => env('DB_USERNAME', 'forge'),
-			'password'  => env('DB_PASSWORD', ''),
+			'database'  => env('DB_DATABASE', 'dnf'),
+			'username'  => env('DB_USERNAME', 'root'),
+			'password'  => env('DB_PASSWORD', '123qwe'),
 			'charset'   => 'utf8',
 			'collation' => 'utf8_unicode_ci',
 			'prefix'    => env('DB_DATABASE_PREFIX', 'dnf_'),

dnf/resources/views/backend/aboutus/create.blade.php

@@ -1,6 +1,5 @@
 @extends('backend.layouts.dashboard')
-
-@section('title')
+('title')
 {{ Lang::get('backend.title.aboutus.create') }}
 @stop
 

dnf/resources/views/backend/blog/category.blade.php

@@ -124,7 +124,7 @@
                </div>
           </div>
         </div>
-       
+
     </div><!--/.modal-body-->
     <div class="modal-footer">
     <button  type="submit" class="btn btn-primary" >保存</button>
@@ -173,7 +173,7 @@
 1
     var creator  =  $(this).parent().siblings("td.creator").text() ;
     $("#update-creator").val(creator);
-    
+
         var updater_id  =  $(this).siblings($("#updater_id")).attr("value") ;
     $("#update-creator-id").val(updater_id);
 

dnf/resources/views/backend/blog/create.blade.php

@@ -23,7 +23,7 @@
                       <label for="title" class="col-sm-1 control-label">图片：</label>
                       <div class="col-sm-10">
                           <div class="has-feedback">
-                              <img width="300" id="img" src="{{{$data->img_URL or ''}}}">
+                              <img width="300" id="demo-img" src="{{{$data->img_URL or ''}}}">
                                <input type="hidden" name="img_URL" id="img_URL" value="{{{$data->img_URL or ''}}}" >
                                <br>
                               <button class="btn btn-primary" type="button" onclick="uploadPic('demo-img');" style="padding: 8px 63px 9px 55px;"/>上传图片</button>
@@ -101,7 +101,7 @@
                       <label for="description" class="col-md-1 control-label">{{ Lang::get('backend.form.blog.description')}}：</label>
                         <div class="col-sm-9">
                           <div class="has-feedback">
-                            <input type="text" class="form-control" name="description" id="description" value="{{ $data->description or old('description') }}"  placeholder="@lang('backend.messages.input-source')">
+                            <input type="text" class="form-control" name="description" id="description" value="{{ $data->description or old('description') }}"  placeholder="@lang('backend.messages.input-description')">
                              <i class="fa fa-asterisk form-control-feedback"></i>
                            </div>
                         </div>