Merge pull request #2014 from z-song/1.5

1.5

Author: z-song

resources/views/form/tags.blade.php

@@ -7,9 +7,11 @@
         @include('admin::form.error')
 
         <select class="form-control {{$class}}" style="width: 100%;" name="{{$name}}[]" multiple="multiple" data-placeholder="{{ $placeholder }}" {!! $attributes !!} >
-            @foreach($value as $select)
-                <option value="{{$select}}" selected>{{$select}}</option>
+
+            @foreach($options as $option)
+                <option value="{{$option}}" {{ in_array($option, $value) ? 'selected' : '' }}>{{$option}}</option>
             @endforeach
+
         </select>
         <input type="hidden" name="{{$name}}[]" />
 

src/Controllers/AuthController.php

@@ -16,55 +16,59 @@
 class AuthController extends Controller
 {
     /**
-     * Login page.
+     * Show the login page.
      *
      * @return \Illuminate\Contracts\View\Factory|Redirect|\Illuminate\View\View
      */
     public function getLogin()
     {
-        if (!Auth::guard('admin')->guest()) {
-            return redirect(config('admin.route.prefix'));
+        if ($this->guard()->check()) {
+            return redirect($this->redirectPath());
         }
 
         return view('admin::login');
     }
 
     /**
+     * Handle a login request.
+     *
      * @param Request $request
      *
      * @return mixed
      */
     public function postLogin(Request $request)
     {
-        $credentials = $request->only(['username', 'password']);
+        $credentials = $request->only([$this->username(), 'password']);
 
+        /** @var \Illuminate\Validation\Validator $validator */
         $validator = Validator::make($credentials, [
-            'username' => 'required', 'password' => 'required',
+            $this->username()   => 'required',
+            'password'          => 'required',
         ]);
 
         if ($validator->fails()) {
-            return Redirect::back()->withInput()->withErrors($validator);
+            return back()->withInput()->withErrors($validator);
         }
 
-        if (Auth::guard('admin')->attempt($credentials)) {
-            admin_toastr(trans('admin.login_successful'));
-
-            return redirect()->intended(config('admin.route.prefix'));
+        if ($this->guard()->attempt($credentials)) {
+            return $this->sendLoginResponse($request);
         }
 
-        return Redirect::back()->withInput()->withErrors(['username' => $this->getFailedLoginMessage()]);
+        return back()->withInput()->withErrors([
+            $this->username() => $this->getFailedLoginMessage(),
+        ]);
     }
 
     /**
      * User logout.
      *
      * @return Redirect
      */
-    public function getLogout()
+    public function getLogout(Request $request)
     {
-        Auth::guard('admin')->logout();
+        $this->guard()->logout();
 
-        session()->forget('url.intented');
+        $request->session()->invalidate();
 
         return redirect(config('admin.route.prefix'));
     }
@@ -143,4 +147,54 @@ protected function getFailedLoginMessage()
             ? trans('auth.failed')
             : 'These credentials do not match our records.';
     }
+
+    /**
+     * Get the post login redirect path.
+     *
+     * @return string
+     */
+    protected function redirectPath()
+    {
+        if (method_exists($this, 'redirectTo')) {
+            return $this->redirectTo();
+        }
+
+        return property_exists($this, 'redirectTo') ? $this->redirectTo : config('admin.route.prefix');
+    }
+
+    /**
+     * Send the response after the user was authenticated.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    protected function sendLoginResponse(Request $request)
+    {
+        admin_toastr(trans('admin.login_successful'));
+
+        $request->session()->regenerate();
+
+        return redirect()->intended($this->redirectPath());
+    }
+
+    /**
+     * Get the login username to be used by the controller.
+     *
+     * @return string
+     */
+    protected function username()
+    {
+        return 'username';
+    }
+
+    /**
+     * Get the guard to be used during authentication.
+     *
+     * @return \Illuminate\Contracts\Auth\StatefulGuard
+     */
+    protected function guard()
+    {
+        return Auth::guard('admin');
+    }
 }

src/Form.php

@@ -1111,6 +1111,20 @@ public function setView($view)
         return $this;
     }
 
+    /**
+     * Set title for form.
+     *
+     * @param string $title
+     *
+     * @return $this
+     */
+    public function setTitle($title = '')
+    {
+        $this->builder()->setTitle($title);
+
+        return $this;
+    }
+
     /**
      * Add a row in form.
      *

src/Form/Builder.php

@@ -87,6 +87,13 @@ class Builder
      */
     protected $view = 'admin::form';
 
+    /**
+     * Form title.
+     *
+     * @var string
+     */
+    protected $title;
+
     /**
      * Builder constructor.
      *
@@ -230,6 +237,20 @@ public function setView($view)
         return $this;
     }
 
+    /**
+     * Set title for form.
+     *
+     * @param string $title
+     *
+     * @return $this
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
     /**
      * Get fields of this builder.
      *
@@ -332,6 +353,10 @@ public function option($option, $value = null)
      */
     public function title()
     {
+        if ($this->title) {
+            return $this->title;
+        }
+
         if ($this->mode == static::MODE_CREATE) {
             return trans('admin.create');
         }

src/Form/Field/Tags.php

@@ -65,7 +65,7 @@ public function value($value = null)
             return empty($this->value) ? ($this->getDefault() ?? []) : $this->value;
         }
 
-        $this->value = $value;
+        $this->value = (array) $value;
 
         return $this;
     }
@@ -80,6 +80,8 @@ public function render()
             tokenSeparators: [',']
         });";
 
-        return parent::render();
+        return parent::render()->with([
+            'options' => array_unique(array_merge($this->value, $this->options)),
+        ]);
     }
 }

src/Grid/Displayers/RowSelector.php

@@ -25,6 +25,16 @@ protected function script()
         $(this).closest('tr').css('background-color', '');
     }
 });
+
+var selectedRows = function () {
+    var selected = [];
+    $('.grid-row-checkbox:checked').each(function(){
+        selected.push($(this).data('id'));
+    });
+
+    return selected;
+}
+
 EOT;
     }
 }

src/Grid/Row.php

@@ -9,7 +9,7 @@ class Row
      *
      * @var
      */
-    protected $number;
+    public $number;
 
     /**
      * Row data.

src/Grid/Tools/BatchActions.php

@@ -104,15 +104,6 @@ protected function script()
     }
 });
 
-var selectedRows = function () {
-    var selected = [];
-    $('.grid-row-checkbox:checked').each(function(){
-        selected.push($(this).data('id'));
-    });
-
-    return selected;
-}
-
 EOT;
     }