Merge branch 'master' of moshaorui/mtb_dcatadmin_album into stable

app/Admin/Controllers/SiteUserController.php

@@ -55,6 +55,8 @@ class SiteUserController extends AdminController
     protected function form()
     {
         return Form::make(new SiteUser(), function (Form $form) {
+            $password = $form->model()->password;
+            $form->model()->password = '';
             $form->text('username')->required();
             $form->text('nick_name')->required();
             $form->text('password');
@@ -70,11 +72,11 @@ class SiteUserController extends AdminController
                     return json_encode($value);
                 });
 
-            $form->saving(function (Form $form) {
+            $form->saving(function (Form $form) use ($password) {
                 if ($form->password) {
                     $form->password = bcrypt($form->password);
                 } else {
-                    $form->password = $form->model()->password;
+                    $form->password = $password;
                 }
             });