added query hook for contents query API and some minor improvements

Author: darryldecode

src/Darryldecode/Backend/Components/ContentBuilder/Commands/QueryContentsCommand.php

@@ -60,6 +60,10 @@ class QueryContentsCommand extends Command implements SelfHandling {
      * @var null
      */
     private $endDate;
+    /**
+     * @var null
+     */
+    private $queryHook;
 
     /**
      * @param null $type
@@ -74,6 +78,7 @@ class QueryContentsCommand extends Command implements SelfHandling {
      * @param bool $disablePermissionChecking
      * @param null $startDate
      * @param null $endDate
+     * @param null $queryHook
      */
     public function __construct($type = null,
                                 $status = 'any',
@@ -86,7 +91,8 @@ public function __construct($type = null,
                                 $sortOrder = 'DESC',
                                 $disablePermissionChecking = false,
                                 $startDate = null,
-                                $endDate = null)
+                                $endDate = null,
+                                $queryHook = null)
     {
         parent::__construct();
         $this->type = $type;
@@ -102,6 +108,7 @@ public function __construct($type = null,
         $this->disablePermissionChecking = $disablePermissionChecking;
         $this->startDate = $startDate;
         $this->endDate = $endDate;
+        $this->queryHook = $queryHook;
     }
 
     /**
@@ -215,6 +222,15 @@ protected function query($contentType, $content)
             $q->ofEndDate($this->endDate);
         }
 
+        // trigger query hook if provided
+        if( !is_null($this->queryHook) && (is_callable($this->queryHook)) )
+        {
+            if( $res = call_user_func($this->queryHook,$q) )
+            {
+                $q = $res;
+            }
+        }
+
         // decide whether request wants paginated version or not
         if( $this->paginated )
         {

src/Darryldecode/Backend/Components/Navigation/Commands/ListCustomNavigationCommand.php

@@ -32,15 +32,21 @@ class ListCustomNavigationCommand extends Command implements SelfHandling {
      * @var string
      */
     private $orderSort;
+    /**
+     * @var null
+     */
+    private $id;
 
     /**
+     * @param int|null $id
      * @param bool $paginated
      * @param int $perPage
      * @param string $orderBy
      * @param string $orderSort
      * @param bool $disablePermissionChecking
      */
-    public function __construct($paginated = true,
+    public function __construct($id = null,
+                                $paginated = true,
                                 $perPage = 8,
                                 $orderBy = 'created_at',
                                 $orderSort = 'DESC',
@@ -53,6 +59,7 @@ public function __construct($paginated = true,
         $this->orderSort = $orderSort;
         $this->args = get_defined_vars();
         $this->disablePermissionChecking = $disablePermissionChecking;
+        $this->id = $id;
     }
 
     /**
@@ -74,13 +81,23 @@ public function handle(Navigation $navigation, Dispatcher $dispatcher)
         // fire before create event
         $dispatcher->fire('navigationBuilder.beforeQuery', array($this->args));
 
-        if( $this->paginated )
+        if( $this->id && ($this->id!='') )
         {
-            $res = $navigation->with(array())->paginate($this->perPage);
+            if( ! $res = $navigation->with(array())->find($this->id) )
+            {
+                return new CommandResult(false, "Navigation does not exist.", null, 404);
+            }
         }
         else
         {
-            $res = $navigation->all();
+            if( $this->paginated )
+            {
+                $res = $navigation->with(array())->paginate($this->perPage);
+            }
+            else
+            {
+                $res = $navigation->all();
+            }
         }
 
         // fire after create

src/Darryldecode/Backend/Components/User/Commands/CreateUserCommand.php

@@ -49,11 +49,11 @@ class CreateUserCommand extends Command implements SelfHandling {
      * @param $lastName
      * @param $email
      * @param $password
-     * @param $permissions
-     * @param $groups
+     * @param array $permissions
+     * @param array $groups
      * @param bool $disablePermissionChecking
      */
-    public function __construct($firstName, $lastName, $email, $password, $permissions, $groups, $disablePermissionChecking = false)
+    public function __construct($firstName, $lastName, $email, $password, $permissions = array(), $groups = array(), $disablePermissionChecking = false)
     {
         parent::__construct();
         $this->firstName = $firstName;

src/Darryldecode/Backend/Components/User/Controllers/UserController.php

@@ -83,7 +83,7 @@ public function postCreate()
                 'firstName' => $this->request->get('firstName', null),
                 'lastName' => $this->request->get('lastName', null),
                 'email' => $this->request->get('email', null),
-                'password' => $this->request->get('password', array()),
+                'password' => $this->request->get('password', null),
                 'permissions' => $this->request->get('permissions', array()),
                 'groups' => $this->request->get('groups', array()),
             )

src/Darryldecode/Backend/Components/User/Views/groups.blade.php

@@ -85,12 +85,15 @@
                                     <li data-ng-if="!groups.length" class="list-group-item text-center">Loading groups <i class="fa fa-spinner fa-spin"></i></li>
                                     <li data-ng-repeat="g in groups" class="list-group-item group-item-@{{$index}}">
                                         <p>
-                                            <b>Group:</b> @{{g.name}}
-                                            <button data-ng-click="edit.edit(g)" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</button>
-                                            <button data-ng-click="group.trash(g.id, $index)" class="btn btn-warning btn-sm"><i class="fa fa-trash-o"></i> Delete</button>
+                                            Group Name: <b>@{{g.name}}</b><br>
+                                            Group ID: <b>[@{{g.id}}]</b>
+                                            <span class="pull-right">
+                                                <button data-ng-click="edit.edit(g)" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</button>
+                                                <button data-ng-click="group.trash(g.id, $index)" class="btn btn-warning btn-xs"><i class="fa fa-trash-o"></i> Delete</button>
+                                            </span>
                                         </p>
                                         <p>
-                                            <b><i class="fa fa-lock"></i> Permissions:</b>
+                                            <i class="fa fa-lock"></i> Permissions:
                                             <div class="clearfix">
                                                 <label data-ng-repeat="(k,v) in g.permissions" class="permission pull-left label label-@{{(v==-1) ? 'danger' : 'success'}}">
                                                     @{{k}}