Merge branch 'table-multiple-bug'

Author: tabacitu

CHANGELOG.md

@@ -20,6 +20,90 @@ All Notable changes to `Backpack CRUD` will be documented in this file
 - Nothing
 
 
+## [3.1.25] - 2016-09-30
+
+### Fixed
+- bug fix for 'table' field type - you can now have multiple fields on the same form;
+
+
+## [3.1.24] - 2016-09-27
+
+### Added
+- address field type - thanks to [Owen Melbourne](https://github.com/OwenMelbz);
+
+
+## [3.1.23] - 2016-09-27
+
+### Added
+- autoFocus() and autoFocusOnFirstField() - thanks to [Owen Melbourne](https://github.com/OwenMelbz);
+
+
+## [3.1.22] - 2016-09-27
+
+### Fixed
+- checklist and checklist_dependency fields allow html on labels;
+
+
+## [3.1.21] - 2016-09-26
+
+### Added
+- "table" field type - thanks to [Owen Melbourne](https://github.com/OwenMelbz);
+- "multidimensional_array" column type - thanks to [Owen Melbourne](https://github.com/OwenMelbz);
+
+
+## [3.1.20] - 2016-09-26
+
+### Added
+- Non-core CRUD features are now separated into traits;
+
+### Fixed
+- The 'password' field is no longer filtered before the create event;
+- CrudPanels can now be defined in the new EntityCrudController::setup() method;
+
+## [3.1.19] - 2016-09-26
+
+### Fixed
+- AJAX datatables can now have select_multiple columns;
+
+
+## [3.1.18] - 2016-09-25
+
+### Fixed
+- checkbox field has default value;
+
+
+
+## [3.1.17] - 2016-09-25
+
+### Fixed
+- Raw DB queries did not account for DB prefixes;
+
+
+## [3.1.16] - 2016-09-22
+
+### Added
+- Radio field and column - thanks to [Owen Melbourne](https://github.com/OwenMelbz);
+
+
+## [3.1.15] - 2016-09-21
+
+### Fixed
+- Missing $fillable item in model will now throw correct error, because _token is ignored;
+- Correct and complete language files;
+
+
+## [3.1.14] - 2016-09-19
+
+### Fixed
+- Checkbox storing issue in Laravel 5.3 - #115 thanks to [timdiels1](https://github.com/timdiels1);
+
+
+## [3.1.13] - 2016-09-19
+
+### Added
+- Revisions functionality, thanks to [se1exin](https://github.com/se1exin);
+
+
 ## [3.1.12] - 2016-09-19
 
 ### Added

README.md

@@ -23,7 +23,7 @@ Features:
 - Easily extend fields (customising a field type or adding a new one is as easy as creating a new view with a particular name)
 - Easily overwrite functionality (customising how the create/update/delete/reorder process works is as easy as creating a new function with the proper name in your EntityCrudCrontroller)
 
-**Subscribe to the [Mailchimp list](http://eepurl.com/bUEGjf) to be announced of any major features or breaking changes (once every 1-3 months).** 
+**Subscribe to the [Mailchimp list](http://eepurl.com/bUEGjf) to be announced of any major features or breaking changes (once every 1-3 months).**
 
 ![List / table view for Backpack/CRUD](https://dl.dropboxusercontent.com/u/2431352/backpack_crud_list.png)
 
@@ -59,14 +59,14 @@ $ php artisan vendor:publish --provider="Backpack\CRUD\CrudServiceProvider" --ta
 
 5) If you haven't already, go through [steps 3-5 from the Backpack\Base installation](https://github.com/Laravel-Backpack/Base#install) (it provides the general views for the admin panel - layout, menu, notification bubbles, etc).
 
-6) [Optional] You can now the file manager to the menu, in resources/views/vendor/backpack/base/inc/sidebar.blade.php or menu.blade.php:
+6) [Optional] You can now the file manager to the menu, in `resources/views/vendor/backpack/base/inc/sidebar.blade.php` or `menu.blade.php`:
 ```html
 <li><a href="{{ url('admin/elfinder') }}"><i class="fa fa-files-o"></i> <span>File manager</span></a></li>
 ```
 
 ## Usage
 
-Check out the documentation at https://laravelbackpack.com 
+Check out the documentation at https://laravelbackpack.com
 
 
 In short:
@@ -79,6 +79,40 @@ In short:
 
 4. **(optional)** Define your validation rules in a Request files.
 
+
+## **(Optional)** Enable Revisions
+
+CRUD supports tracking and restoring Model change Revisions with the help of [VentureCraft/revisionable](https://github.com/VentureCraft/revisionable).
+
+To enable revisions on your Model do the following:
+
+1. Run:
+```bash
+$ php artisan migrate --path=vendor/venturecraft/revisionable/src/migrations #run revisionable migrations
+```
+
+2. Add the `\Venturecraft\Revisionable\RevisionableTrait` Trait to your Model. E.g:
+```php
+namespace MyApp\Models;
+
+class Article extends Eloquent {
+    use \Backpack\CRUD\CrudTrait, \Venturecraft\Revisionable\RevisionableTrait;
+
+    // If you are using another bootable trait the be sure to override the boot method in your model
+    public static function boot()
+    {
+        parent::boot();
+    }
+}
+```
+
+3. Enable access to Revisions in your CrudController with:
+```php
+$this->crud->allowAccess('revisions');
+```
+
+Head on over to the [VentureCraft/revisionable](https://github.com/VentureCraft/revisionable) GitHub repo to see the full documentation and extra configuration options.
+
 ## Screenshots
 
 - List view pictured above.

composer.json

@@ -27,6 +27,7 @@
         "barryvdh/laravel-elfinder": "^0.3.5",
         "livecontrol/eloquent-datatable": "^0.1.5",
         "doctrine/dbal": "^2.5",
+        "venturecraft/revisionable": "1.*",
         "intervention/image": "^2.3"
     },
     "require-dev": {

src/CrudPanel.php

@@ -15,10 +15,12 @@
 use Backpack\CRUD\PanelTraits\Read;
 use Backpack\CRUD\PanelTraits\Reorder;
 use Backpack\CRUD\PanelTraits\Update;
+use Backpack\CRUD\PanelTraits\ViewsAndRestoresRevisions;
+use Backpack\CRUD\PanelTraits\AutoFocus;
 
 class CrudPanel
 {
-    use Create, Read, Update, Delete, Reorder, Access, Columns, Fields, Query, Buttons, AutoSet, FakeFields, FakeColumns;
+    use Create, Read, Update, Delete, Reorder, Access, Columns, Fields, Query, Buttons, AutoSet, FakeFields, FakeColumns, ViewsAndRestoresRevisions, AutoFocus;
 
     // --------------
     // CRUD variables
@@ -34,7 +36,7 @@ class CrudPanel
     public $entity_name = 'entry'; // what name will show up on the buttons, in singural (ex: Add entity)
     public $entity_name_plural = 'entries'; // what name will show up on the buttons, in plural (ex: Delete 5 entities)
 
-    public $access = ['list', 'create', 'update', 'delete'/* 'reorder', 'show', 'details_row' */];
+    public $access = ['list', 'create', 'update', 'delete'/* 'revisions', reorder', 'show', 'details_row' */];
 
     public $reorder = false;
     public $reorder_label = false;

src/CrudServiceProvider.php

@@ -106,6 +106,14 @@ public static function resource($name, $controller, array $options = [])
             'as' => 'crud.'.$name.'.translateItem',
             'uses' => $controller.'@translateItem',
           ]);
+        Route::get($name.'/{id}/revisions', [
+            'as' => 'crud.'.$name.'.listRevisions',
+            'uses' => $controller.'@listRevisions',
+          ]);
+        Route::post($name.'/{id}/revisions/{revisionId}/restore', [
+            'as' => 'crud.'.$name.'.restoreRevision',
+            'uses' => $controller.'@restoreRevision',
+          ]);
 
         $options_with_default_route_names = array_merge([
             'names' => [

src/CrudTrait.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Config;
 
 trait CrudTrait
 {
@@ -16,7 +17,7 @@ trait CrudTrait
     public static function getPossibleEnumValues($field_name)
     {
         $instance = new static(); // create an instance of the model to be able to get the table name
-        $type = DB::select(DB::raw('SHOW COLUMNS FROM '.$instance->getTable().' WHERE Field = "'.$field_name.'"'))[0]->Type;
+        $type = DB::select(DB::raw('SHOW COLUMNS FROM '.Config::get('database.connections.'.env('DB_CONNECTION').'.prefix').$instance->getTable().' WHERE Field = "'.$field_name.'"'))[0]->Type;
         preg_match('/^enum\((.*)\)$/', $type, $matches);
         $enum = [];
         foreach (explode(',', $matches[1]) as $value) {
@@ -29,7 +30,7 @@ public static function getPossibleEnumValues($field_name)
     public static function isColumnNullable($column_name)
     {
         $instance = new static(); // create an instance of the model to be able to get the table name
-        $answer = DB::select(DB::raw("SELECT IS_NULLABLE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$instance->getTable()."' AND COLUMN_NAME='".$column_name."' AND table_schema='".env('DB_DATABASE')."'"))[0];
+        $answer = DB::select(DB::raw("SELECT IS_NULLABLE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".Config::get('database.connections.'.env('DB_CONNECTION').'.prefix').$instance->getTable()."' AND COLUMN_NAME='".$column_name."' AND table_schema='".env('DB_DATABASE')."'"))[0];
 
         return $answer->IS_NULLABLE === 'YES';
     }

src/PanelTraits/AutoFocus.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Backpack\CRUD\PanelTraits;
+
+trait AutoFocus
+{
+    public $autoFocusOnFirstField = true;
+
+    public function getAutoFocusOnFirstField()
+    {
+        return $this->autoFocusOnFirstField;
+    }
+
+    public function setAutoFocusOnFirstField($value)
+    {
+        return $this->autoFocusOnFirstField = (bool) $value;
+    }
+
+    public function enableAutoFocus()
+    {
+        return $this->setAutoFocusOnFirstField(true);
+    }
+
+    public function disableAutoFocus()
+    {
+        return $this->setAutoFocusOnFirstField(false);
+    }
+}

src/PanelTraits/Buttons.php

@@ -67,6 +67,7 @@ public function initButtons()
         // line stack
         $this->addButton('line', 'preview', 'view', 'crud::buttons.preview', 'end');
         $this->addButton('line', 'update', 'view', 'crud::buttons.update', 'end');
+        $this->addButton('line', 'revisions', 'view', 'crud::buttons.revisions', 'end');
         $this->addButton('line', 'delete', 'view', 'crud::buttons.delete', 'end');
 
         // top stack

src/PanelTraits/ViewsAndRestoresRevisions.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Backpack\CRUD\PanelTraits;
+
+use Venturecraft\Revisionable\Revision;
+
+trait ViewsAndRestoresRevisions
+{
+    /**
+     * Build a list of Revisions, grouped by revision date.
+     *
+     * @return [Array] of revision groups, keyed by revision date
+     */
+    public function listRevisions($id)
+    {
+        $revisions = [];
+        // Group revisions by change date
+        foreach ($this->getEntry($id)->revisionHistory as $history) {
+
+            // Get just the date from the revision created timestamp
+            $revisionDate = date('Y-m-d', strtotime((string) $history->created_at));
+
+            // Be sure to instantiate the initial grouping array
+            if (! array_key_exists($revisionDate, $revisions)) {
+                $revisions[$revisionDate] = [];
+            }
+
+            // Push onto the top of the current group - so we get orderBy decending timestamp
+            array_unshift($revisions[$revisionDate], $history);
+        }
+
+        // Sort the array by timestamp descending (so that the most recent are at the top)
+        arsort($revisions);
+
+        return $revisions;
+    }
+
+    /**
+     * Restore a single revision.
+     *
+     * @param  [int] $id         The ID of the source CRUD Model instance to update
+     * @param  [int] $revisionId The ID of the revision to use for the update
+     */
+    public function restoreRevision($id, $revisionId)
+    {
+        $entry = $this->getEntry($id);
+        $revision = Revision::findOrFail($revisionId);
+
+        // Update the revisioned field with the old value
+        $entry->{$revision->fieldName()} = $revision->oldValue();
+        $entry->save();
+
+        // Reload the entry so we have the latest revisions
+        $entry = $this->getEntry($id);
+    }
+}