Merge branch 'master' of github.com:BKWLD/decoy into 5.10.x

classes/Controllers/Admins.php

@@ -13,23 +13,6 @@
  */
 class Admins extends Base
 {
-    /**
-     * Normal Decoy controller config.  There is some increased specifity so that
-     * subclassing controllers don't have to have to specify everything.
-     *
-     * @var string
-     */
-    protected $description = 'Users who have access to the admin.';
-
-    /**
-     * @var array
-     */
-    protected $columns = [
-        'Name'          => 'getAdminTitleHtmlAttribute',
-        'Status'        => 'getAdminStatusAttribute',
-        'Email'         => 'email',
-    ];
-
     /**
      * @var string
      */
@@ -102,7 +85,6 @@ public function index()
         if (!app('decoy.user')->can('read', 'admins')) {
             return Redirect::to(app('decoy.user')->getUserUrl());
         }
-
         return parent::index();
     }
 
@@ -114,7 +96,6 @@ public function index()
     public function edit($id)
     {
         unset(Admin::$rules['password']);
-
         return parent::edit($id);
     }
 
@@ -185,7 +166,9 @@ public function enable($id)
     }
 
     /**
-     * Populate protected properties on init
+     * Populate protected properties with localized labels on init
+     *
+     * @return $this
      */
     public function __construct()
     {

docs/models.md

@@ -191,8 +191,8 @@ public function services() {
     ->withTimestamps();
 }
 public function servicesAsChild() {
-  return $this->morphedByMany('App\Service', 'serviceable')-
-    >withTimestamps();
+  return $this->morphedByMany('App\Service', 'serviceable')
+    ->withTimestamps();
 }
 ```