Mike 8 years ago
parent
commit
087c7c334f

+ 5 - 13
app/Http/Controllers/Admin/VideoController.php

@@ -43,13 +43,10 @@ class VideoController extends Controller
     public function store(VideoRequest $request)
     public function store(VideoRequest $request)
     {
     {
         if ($data = $request->all()) {
         if ($data = $request->all()) {
-            $data['user_id'] = Auth::guard('admin')->user()->id;
             $video = Video::create($data);
             $video = Video::create($data);
             if ($video) {
             if ($video) {
-                Toastr::success('视频添加成功!');
                 return redirect(route('admin.video'));
                 return redirect(route('admin.video'));
             } else {
             } else {
-                Toastr::error('视频添加失败!');
                 return back()->with('errors', ['视频添加失败!']);
                 return back()->with('errors', ['视频添加失败!']);
             }
             }
         }
         }
@@ -102,10 +99,8 @@ class VideoController extends Controller
         if ($data = $request->all()) {
         if ($data = $request->all()) {
             $result = $video->update($data);
             $result = $video->update($data);
             if ($result) {
             if ($result) {
-                Toastr::success('视频编辑成功!');
                 return redirect()->route('admin.video');
                 return redirect()->route('admin.video');
             } else {
             } else {
-                Toastr::error('视频编辑失败!');
                 return back()->with('errors', ['视频编辑失败!']);
                 return back()->with('errors', ['视频编辑失败!']);
             }
             }
         }
         }
@@ -121,15 +116,12 @@ class VideoController extends Controller
     {
     {
         $video = Video::find($id);
         $video = Video::find($id);
         if(!$video) {
         if(!$video) {
-            Toastr::error('视频不存在');
-            return redirect(route('admin.video'));
+            return redirect()->route('admin.video')->with('errors', ['视频未找到!']);
         }
         }
-
-        if($video->delete()){
-            Toastr::success('视频删除成功!');
-        }else{
-            Toastr::error('视频删除失败!');
+        $err = '视频删除成功';
+        if(!$video->delete()){
+            $err = '视频删除失败!';
         }
         }
-        return redirect(route('admin.video'));
+        return redirect()->route('admin.video')->with('errors', [$err]);
     }
     }
 }
 }

+ 3 - 11
resources/views/admin/department/edit.blade.php

@@ -127,17 +127,9 @@
             </div>
             </div>
             <div class="box-body">
             <div class="box-body">
                 <form class="form-horizontal form-bordered"  action="{{ url("/department/$data->id") }}" method="POST">
                 <form class="form-horizontal form-bordered"  action="{{ url("/department/$data->id") }}" method="POST">
-                    @if(count($errors)>0)
-                        <div class="callout callout-danger">
-                            @if(is_object($errors))
-                                @foreach($errors->all() as $error)
-                                    <p>{{ $error }}</p>
-                                @endforeach
-                            @else
-                                <p>{{ $errors }}</p>
-                            @endif
-                        </div>
-                    @endif
+
+                    @include('admin.errors', ['errors' => $errors])
+
                     <input type="hidden" name="_method" value="put" >
                     <input type="hidden" name="_method" value="put" >
                     {{csrf_field()}}
                     {{csrf_field()}}
                     <div class="panel-body panel-body-nopadding">
                     <div class="panel-body panel-body-nopadding">

+ 19 - 0
resources/views/admin/errors.blade.php

@@ -0,0 +1,19 @@
+@if (count($errors) > 0)
+    <div class="alert alert-danger">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+        @if(is_object($errors))
+            @foreach($errors->all() as $error)
+                <strong>{{ $error }}!</strong>
+            @endforeach
+        @elseif(is_array($errors))
+            @foreach($errors as $error)
+                <strong>{{ $error }}!</strong>
+            @endforeach
+        @else
+            <strong>{{ $errors }}!</strong>
+        @endif
+    </div>
+@endif
+
+
+

+ 3 - 11
resources/views/admin/project/create.blade.php

@@ -34,17 +34,9 @@
             <div class="box-body">
             <div class="box-body">
                 <form class="form-horizontal form-bordered" action="{{ url('/project') }}" method="POST">
                 <form class="form-horizontal form-bordered" action="{{ url('/project') }}" method="POST">
                     {{ csrf_field() }}
                     {{ csrf_field() }}
-                    @if(count($errors)>0)
-                        <div class="callout callout-danger">
-                            @if(is_object($errors))
-                                @foreach($errors->all() as $error)
-                                    <p>{{ $error }}</p>
-                                @endforeach
-                            @else
-                                <p>{{ $errors }}</p>
-                            @endif
-                        </div>
-                    @endif
+
+                    @include('admin.errors', ['errors' => $errors])
+
                     <div class="panel-body panel-body-nopadding">
                     <div class="panel-body panel-body-nopadding">
 
 
                         <div class="form-group">
                         <div class="form-group">

+ 3 - 11
resources/views/admin/project/edit.blade.php

@@ -33,17 +33,9 @@
                 <form class="form-horizontal form-bordered"  action="{{ url("/project/$data->id") }}" method="POST">
                 <form class="form-horizontal form-bordered"  action="{{ url("/project/$data->id") }}" method="POST">
                     <input type="hidden" name="_method" value="put" >
                     <input type="hidden" name="_method" value="put" >
                     {{csrf_field()}}
                     {{csrf_field()}}
-                    @if(count($errors)>0)
-                        <div class="callout callout-danger">
-                            @if(is_object($errors))
-                                @foreach($errors->all() as $error)
-                                    <p>{{ $error }}</p>
-                                @endforeach
-                            @else
-                                <p>{{ $errors }}</p>
-                            @endif
-                        </div>
-                    @endif
+
+                    @include('admin.errors', ['errors' => $errors])
+
                     <div class="panel-body panel-body-nopadding">
                     <div class="panel-body panel-body-nopadding">
 
 
                         <div class="form-group">
                         <div class="form-group">