wip #3490

diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index 426787cb55cf9702b3cee8ab9162e48eeb3db9c2..f3c1e77fd14831133e7b118bcd321e28dd0fe5b2 100644 (file)
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -31,6 +31,8 @@ class CubistMagicController extends CubistCrudController
     protected $_oneInstance;
     protected $_nested = false;
 
+    protected $hidden=[];
+
     public function _postSetModel()
     {
 
@@ -119,8 +121,10 @@ class CubistMagicController extends CubistCrudController
             $field = Field::getInstance($field);
         }
         if (!$field->getAttribute('fillable', true)) {
-           $field->setAttribute('type','hidden');
-           $field->setAttribute('type','hidden');
+            $field->setAttribute('type', 'hidden');
+        }
+        if ($field->getAttribute('hidden', false)) {
+            $this->hidden[] = $field->getAttribute('name');
         }
         /** @var $field Field */
         if ($field->isDisplayColumn()) {

diff --git a/src/app/Magic/Models/CubistMagicAuthenticatable.php b/src/app/Magic/Models/CubistMagicAuthenticatable.php
index fa23dadb087349778b0bdfb0c8fe183ec411415c..db1cfc6287c7d119cd970c7a2676e2430149cbd4 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAuthenticatable.php
+++ b/src/app/Magic/Models/CubistMagicAuthenticatable.php
@@ -3,6 +3,7 @@
 
 namespace Cubist\Backpack\app\Magic\Models;
 
+use Backpack\CRUD\app\Notifications\ResetPasswordNotification;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\MustVerifyEmail;
 use Illuminate\Auth\Passwords\CanResetPassword;
@@ -44,4 +45,13 @@ class CubistMagicAuthenticatable extends CubistMagicAbstractModel
     {
         return $this->email;
     }
+
+    public function setFields()
+    {
+        parent::setFields();
+
+        $this->addField(['name' => 'remember_token',
+            'type' => 'Text',
+            'hidden' => true]);
+    }
 }