fix bug

tanwencn · Apr 29, 2020 · 2b3e9c6 · 2b3e9c6
1 parent eb12824
commit 2b3e9c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resources/views/_auth/login.blade.php b/resources/views/_auth/login.blade.php
@@ -45,7 +45,7 @@
       <div class="form-group has-feedback {!! !$errors->has('password') ?: 'has-error' !!}">
 
         @if($errors->has('password'))
-            <label class="control-label" for="inputError"><i class="fa fa-times-circle-o"></i>{{$errors->first(password)}}</label></br>
+            <label class="control-label" for="inputError"><i class="fa fa-times-circle-o"></i>{{$errors->first('password')}}</label></br>
         @endif
 
         <input type="password" class="form-control" placeholder="{{ trans('admin.password') }}" name="password">

diff --git a/src/Http/Controllers/PermissionController.php b/src/Http/Controllers/PermissionController.php
@@ -111,7 +111,7 @@ public function destroy($id, Request $request)
     }
 
     protected function hasAlreadyPermission($model){
-        abort_unless(Auth::user()->hasPermissionTo(intval($model->id)), 402, "you is no permission id {$model->name}");
+        if($model->id) abort_unless(Auth::user()->hasPermissionTo(intval($model->id)), 402, "you is no permission id {$model->name}");
     }
 
     protected function abilitiesMap()