wip #3439 @0.5

diff --git a/src/app/Console/Commands/InstallCommand.php b/src/app/Console/Commands/InstallCommand.php
index 3411686e91d4038e6ed38516c309a8ef0993d797..ae00f840ca450e1a1e7da56fa78e9d5b83af5f1e 100644 (file)
--- a/src/app/Console/Commands/InstallCommand.php
+++ b/src/app/Console/Commands/InstallCommand.php
@@ -32,6 +32,8 @@ class InstallCommand extends CubistCommand
                 'php artisan vendor:publish --provider="Spatie\Permission\PermissionServiceProvider" --tag="config"',
                 'php artisan vendor:publish --provider="Backpack\PermissionManager\PermissionManagerServiceProvider"',
                 'php artisan backpack:add-sidebar-content "<li class=\'nav-item nav-dropdown\'><a class=\'nav-link nav-dropdown-toggle\' href=\'#\'><i class=\'nav-icon fa fa-group\'></i>Authentication</a><ul class=\'nav-dropdown-items\'><li class=\'nav-item\'><a class=\'nav-link\' href=\'{{ backpack_url(\'user\') }}\'><i class=\'nav-icon fa fa-user\'></i><span>Users</span></a></li><li class=\'nav-item\'><a class=\'nav-link\' href=\'{{ backpack_url(\'role\') }}\'><i class=\'nav-icon fa fa-group\'></i> <span>Roles</span></a></li><li class=\'nav-item\'><a class=\'nav-link\' href=\'{{ backpack_url(\'permission\') }}\'><i class=\'nav-icon fa fa-key\'></i><span>Permissions</span></a></li></ul></li>"',
+                // Revisions
+                'cp vendor/venturecraft/revisionable/src/migrations/2013_04_09_062329_create_revisions_table.php database/migrations/',
             ],
             'Install dev dependencies' => ['composer require --dev ' . implode(' ', $devPackages)],
             "Dropzone" => 'php artisan gaspertrix:backpack:dropzone:install',

diff --git a/src/app/Http/Controllers/CubistRedirectToAdminController.php b/src/app/Http/Controllers/CubistRedirectToAdminController.php
new file mode 100644 (file)
index 0000000..f0b34c0
--- /dev/null
+++ b/src/app/Http/Controllers/CubistRedirectToAdminController.php
@@ -0,0 +1,19 @@
+<?php
+
+
+namespace  Cubist\Backpack\app\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class CubistRedirectToAdminController extends CubistFrontController
+{
+    public function index(Request $request, $id)
+    {
+        redirect(backpack_url());
+    }
+
+    public function catchall(Request $request, $main = '', $subs = '')
+    {
+        redirect(backpack_url());
+    }
+}

diff --git a/src/app/Http/Controllers/Operations/BulkPublishOperation.php b/src/app/Http/Controllers/Operations/BulkPublishOperation.php
index 218796860d5a0c15c67f77878982ab6522081e2e..00f355af41bd18ef512e50257c3d3b46074394d0 100644 (file)
--- a/src/app/Http/Controllers/Operations/BulkPublishOperation.php
+++ b/src/app/Http/Controllers/Operations/BulkPublishOperation.php
@@ -2,6 +2,7 @@
 
 namespace Cubist\Backpack\app\Http\Controllers\Operations;
 
+use Cubist\Backpack\app\Magic\Models\CubistMagicPageModel;
 use Cubist\Backpack\CubistBackpackServiceProvider;
 use Illuminate\Support\Facades\Route;
 
@@ -29,10 +30,12 @@ trait BulkPublishOperation
 
     protected function setupBulkPublishDefaults()
     {
-        if ($this->_bulk) {
-            $this->crud->enableBulkActions();
-            $this->crud->addButton('bottom', 'bulk_publish', 'view', CubistBackpackServiceProvider::NAMESPACE . '::buttons.bulk_publish', 'begining');
-            $this->crud->addButton('bottom', 'bulk_offline', 'view', CubistBackpackServiceProvider::NAMESPACE . '::buttons.bulk_offline', 'begining');
-        }
+        $this->crud->operation('list', function () {
+            if($this->crud->getModel() instanceof CubistMagicPageModel) {
+                $this->crud->enableBulkActions();
+                $this->crud->addButton('bottom', 'bulk_publish', 'view', CubistBackpackServiceProvider::NAMESPACE . '::buttons.bulk_publish', 'begining');
+                $this->crud->addButton('bottom', 'bulk_offline', 'view', CubistBackpackServiceProvider::NAMESPACE . '::buttons.bulk_offline', 'begining');
+            }
+        });
     }
 }

diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index 8ac2ae9255799d471c79828de2a6870a18ec5126..0c6fc4ed4881358ba1f27769c18917f5b4deb130 100644 (file)
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -59,7 +59,6 @@ class CubistMagicController extends CubistCrudController
 
     public function setup()
     {
-        dd('setup');
         $this->crud->setModel($this->_modelNamespace);
         $this->_postSetModel();
 
@@ -217,7 +216,7 @@ class CubistMagicController extends CubistCrudController
         $this->getModelInstance()->onBeforeStore($this, $request);
 
         // your additional operations before save here
-        $redirect_location = parent::storeCrud($request);
+        $redirect_location = parent::store();
         // your additional operations after save here
         // use $this->data['entry'] or $this->crud->entry
         return $redirect_location;
@@ -235,7 +234,7 @@ class CubistMagicController extends CubistCrudController
         $this->getModelInstance()->onBeforeUpdate($this, $request);
 
         // your additional operations before save here
-        $redirect_location = parent::updateCrud($request);
+        $redirect_location = parent::update();
         // your additional operations after save here
         // use $this->data['entry'] or $this->crud->entry
         return $redirect_location;

diff --git a/src/resources/install/app/Http/Controllers/PageController.php b/src/resources/install/app/Http/Controllers/PageController.php
new file mode 100644 (file)
index 0000000..8881bfd
--- /dev/null
+++ b/src/resources/install/app/Http/Controllers/PageController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Cubist\Backpack\app\Http\Controllers\CubistPageController;
+
+class PageController extends CubistPageController
+{
+
+}

diff --git a/src/resources/views/buttons/bulk_offline.blade.php b/src/resources/views/buttons/bulk_offline.blade.php
index 5393c41367916c6a6048681aec3232962d927121..ef7b885471a5338eaced492c629ea02b0a2501e8 100644 (file)
--- a/src/resources/views/buttons/bulk_offline.blade.php
+++ b/src/resources/views/buttons/bulk_offline.blade.php
@@ -1,4 +1,4 @@
-@if ($crud->hasAccess('update') && $crud->bulk_actions)
+@if ($crud->hasAccess('update') && $crud->get('list.bulkActions'))
        <a href="javascript:void(0)" onclick="bulkOfflineEntries(this)" class="btn btn-sm btn-default bulk-button"><i class="fa fa-times-circle"></i> Put offline</a>
 @endif
 

diff --git a/src/resources/views/buttons/bulk_publish.blade.php b/src/resources/views/buttons/bulk_publish.blade.php
index 911d8eafe958a483093d056f2b5f20e4ad2912a8..7cab5a7bd0cdaeb7c1c6eda2471c333428de6aa0 100644 (file)
--- a/src/resources/views/buttons/bulk_publish.blade.php
+++ b/src/resources/views/buttons/bulk_publish.blade.php
@@ -1,58 +1,58 @@
-@if ($crud->hasAccess('update') && $crud->bulk_actions)
-       <a href="javascript:void(0)" onclick="bulkPublishEntries(this)" class="btn btn-sm btn-default bulk-button"><i class="fa fa-check-circle"></i> Publish</a>
+@if ($crud->hasAccess('update') && $crud->get('list.bulkActions'))
+    <a href="javascript:void(0)" onclick="bulkPublishEntries(this)" class="btn btn-sm btn-default bulk-button"><i
+            class="fa fa-check-circle"></i> Publish</a>
 @endif
 
 @push('after_scripts')
-<script>
-       if (typeof bulkPublishEntries != 'function') {
-         function bulkPublishEntries(button) {
+    <script>
+        if (typeof bulkPublishEntries != 'function') {
+            function bulkPublishEntries(button) {
 
-             if (typeof crud.checkedItems === 'undefined' || crud.checkedItems.length == 0)
-             {
-               new PNotify({
-                     title: "{{ trans('backpack::crud.bulk_no_entries_selected_title') }}",
-                     text: "{{ trans('backpack::crud.bulk_no_entries_selected_message') }}",
-                     type: "warning"
-                 });
+                if (typeof crud.checkedItems === 'undefined' || crud.checkedItems.length == 0) {
+                    new PNotify({
+                        title: "{{ trans('backpack::crud.bulk_no_entries_selected_title') }}",
+                        text: "{{ trans('backpack::crud.bulk_no_entries_selected_message') }}",
+                        type: "warning"
+                    });
 
-               return;
-             }
+                    return;
+                }
 
-             var message = "Are you sure you want to publish these :number entries?";
-             message = message.replace(":number", crud.checkedItems.length);
+                var message = "Are you sure you want to publish these :number entries?";
+                message = message.replace(":number", crud.checkedItems.length);
 
-             // show confirm message
-             if (confirm(message) == true) {
-                       var ajax_calls = [];
-                       var publish_route = "{{ url($crud->route) }}/bulk-publish";
+                // show confirm message
+                if (confirm(message) == true) {
+                    var ajax_calls = [];
+                    var publish_route = "{{ url($crud->route) }}/bulk-publish";
 
-                               // submit an AJAX delete call
-                               $.ajax({
-                                       url: publish_route,
-                                       type: 'POST',
-                                       data: { entries: crud.checkedItems },
-                                       success: function(result) {
-                                         // Show an alert with the result
-                                         new PNotify({
-                                             title: "Entries published",
-                                             text: crud.checkedItems.length+" entries have been published.",
-                                             type: "success"
-                                         });
+                    // submit an AJAX delete call
+                    $.ajax({
+                        url: publish_route,
+                        type: 'POST',
+                        data: {entries: crud.checkedItems},
+                        success: function (result) {
+                            // Show an alert with the result
+                            new PNotify({
+                                title: "Entries published",
+                                text: crud.checkedItems.length + " entries have been published.",
+                                type: "success"
+                            });
 
-                                         crud.checkedItems = [];
-                                         crud.table.ajax.reload();
-                                       },
-                                       error: function(result) {
-                                         // Show an alert with the result
-                                         new PNotify({
-                                             title: "Publishing failed",
-                                             text: "One or more entries could not be published. Please try again.",
-                                             type: "warning"
-                                         });
-                                       }
-                               });
-             }
-      }
-       }
-</script>
+                            crud.checkedItems = [];
+                            crud.table.ajax.reload();
+                        },
+                        error: function (result) {
+                            // Show an alert with the result
+                            new PNotify({
+                                title: "Publishing failed",
+                                text: "One or more entries could not be published. Please try again.",
+                                type: "warning"
+                            });
+                        }
+                    });
+                }
+            }
+        }
+    </script>
 @endpush