Merge branch '2.2'

orchestral · Aug 16, 2014 · 78fc1df · 78fc1df
2 parents 2c07540 + 8d9f637
commit 78fc1df
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -5,13 +5,29 @@ title: Control Change Log
 
 ## Version 2.2 {#v2-2}
 
+### v2.2.2 {#v2-2-2}
+
+* Allow Roles table to be search and sorted using `Orchestra\Html\Table\Grid` new functionality.
+* Use full PHP syntax.
+
+### v2.2.1 {#v2-2-1}
+
+* Filter theme to only to be shown when the theme support it.
+* Add events to attach fields to roles.
+
 ### v2.2.0 {#v2-2-0}
 
 * Bump minimum version to PHP v5.4.0.
 * Add support for Orchestra Platform 2.2.
 
 ## Version 2.1 {#v2-1}
 
+### v2.1.4 {#v2-1-4}
+
+* Filter theme to only to be shown when the theme support it.
+* Add events to attach fields to roles.
+
+
 ### v2.1.3 {#v2-1-3}
 
 * Added events to hook into the role management.
@@ -79,7 +95,7 @@ title: Control Change Log
 * Revert use of `.checkbox-inline` and use bootstrap grid.
 * Fixed syncing roles issue on `vendor/package` ACL metric.
 * Improve ACL name to show extension name if exist.
-* Fixed route filter not is called before registered. 
+* Fixed route filter not is called before registered.
 
 ### v2.0.3 {#v2-0-3}
 

diff --git a/src/Control/Presenter/Role.php b/src/Control/Presenter/Role.php
@@ -19,7 +19,11 @@ public function table($model)
     {
         return Table::of('control.roles', function ($table) use ($model) {
             // attach Model and set pagination option to true.
-            $table->with($model);
+            $table->with($model)->paginate(true);
+
+            $table->sortable();
+            $table->searchable(array('name'));
+
             $table->layout('orchestra/foundation::components.table');
 
             // Add columns.

diff --git a/src/Control/Processor/Role.php b/src/Control/Processor/Role.php
@@ -31,7 +31,7 @@ public function __construct(RolePresenter $presenter, RoleValidator $validator)
      */
     public function index($listener)
     {
-        $eloquent = $this->model->paginate();
+        $eloquent = $this->model->newQuery();
         $table    = $this->presenter->table($eloquent);
 
         $this->fireEvent('list', array($eloquent, $table));

diff --git a/src/views/acl/index.blade.php b/src/views/acl/index.blade.php
@@ -1,6 +1,6 @@
 @include('orchestra/control::widgets.menu')
 
-<?
+<?php
 
 use Illuminate\Support\Facades\Form;
 use Illuminate\Support\Facades\URL;

diff --git a/src/views/roles/index.blade.php b/src/views/roles/index.blade.php
@@ -1,6 +1,6 @@
 @include('orchestra/control::widgets.menu')
 
-<? Orchestra\Support\Facades\Site::set('header::add-button', true); ?>
+<?php Orchestra\Support\Facades\Site::set('header::add-button', true); ?>
 
 <div class="row">
 	<div class="twelve columns white rounded box">

diff --git a/src/views/widgets/menu.blade.php b/src/views/widgets/menu.blade.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 use Illuminate\Support\Facades\HTML;
 use Illuminate\Support\Facades\Request;