From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 15 Jun 2020 14:09:22 +0000 (+0200)
Subject: wip #3699 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0d84d2982aa665daf59a62d3e978ef90b5496dbc;p=cubist_cms-back.git

wip #3699 @0.5
---

diff --git a/composer.json b/composer.json
index e94fc78..d62e1b8 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "lavary/laravel-menu": "^1.7",
         "graham-campbell/markdown": "^12.0",
         "barryvdh/laravel-debugbar": "^3.3",
-        "league/commonmark-ext-autolink": "^1.0",
+        "league/commonmark": "^1.4",
         "cviebrock/laravel-elasticsearch": "^4.2",
         "spatie/laravel-honeypot": "^2.2",
         "chrisjean/php-ico": "^1.0",
diff --git a/src/app/Magic/Models/CubistMagicAuthenticatable.php b/src/app/Magic/Models/CubistMagicAuthenticatable.php
index 51036a6..9b528a9 100644
--- a/src/app/Magic/Models/CubistMagicAuthenticatable.php
+++ b/src/app/Magic/Models/CubistMagicAuthenticatable.php
@@ -58,7 +58,7 @@ class CubistMagicAuthenticatable extends CubistMagicAbstractModel
             'type' => 'checkbox',
             'tab' => 'Login']);
 
-        $this->addField(['name' => 'permissions',
+        $this->addField(['name' => 'roles_and_permissions',
             'label' => '',
             'type' => 'RolesPermissions',
             'tab' => 'Roles & Permissions']);