wip #4830 @1.5

diff --git a/app/Http/Controllers/Admin/AssetThemesCrudController.php b/app/Http/Controllers/Admin/AssetThemesCrudController.php
new file mode 100644 (file)
index 0000000..3c2c489
--- /dev/null
+++ b/app/Http/Controllers/Admin/AssetThemesCrudController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class AssetThemesCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+{
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
+       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       
+
+
+    /*
+       __('Thème de la médiathèque')
+       __('Thèmes de la médiathèque')
+       */
+
+    protected $_modelNamespace = 'App\Models\AssetTheme';
+    protected $_routeURL = 'asset_themes';
+    protected $_singular = 'Thème de la médiathèque';
+    protected $_plural = 'Thèmes de la médiathèque';
+    protected $_oneInstance= false;
+}

diff --git a/app/Http/Controllers/Admin/CrudController.php b/app/Http/Controllers/Admin/CrudController.php
deleted file mode 100644 (file)
index df975e6..0000000
--- a/app/Http/Controllers/Admin/CrudController.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-class CrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
-{
-    use \Cubist\Backpack\Magic\Operations\CreateOperation;
-       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
-       use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
-       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
-       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
-       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
-       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
-       use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
-       
-
-
-    /*
-       */
-
-    protected $_modelNamespace = 'App\Models\User';
-    protected $_routeURL = '';
-    protected $_singular = '';
-    protected $_plural = '';
-    protected $_oneInstance= false;
-}

diff --git a/app/Http/Controllers/Admin/ResourcesCrudController.php b/app/Http/Controllers/Admin/ResourcesCrudController.php
new file mode 100644 (file)
index 0000000..57ddd13
--- /dev/null
+++ b/app/Http/Controllers/Admin/ResourcesCrudController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class ResourcesCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+{
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
+       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       
+
+
+    /*
+       __('ressource')
+       __('ressources')
+       */
+
+    protected $_modelNamespace = 'App\Models\Resource';
+    protected $_routeURL = 'resources';
+    protected $_singular = 'ressource';
+    protected $_plural = 'ressources';
+    protected $_oneInstance= true;
+}

diff --git a/app/Http/Controllers/Admin/ToolsController.php b/app/Http/Controllers/Admin/ToolsController.php
deleted file mode 100644 (file)
index fa7210f..0000000
--- a/app/Http/Controllers/Admin/ToolsController.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Tools\FluidbookConvert;
-use App\Http\Controllers\Tools\FluidbookPreview;
-use App\Http\Controllers\Tools\Search;
-use Cubist\Socialite\User;
-use Illuminate\Support\Facades\Auth;
-
-class ToolsController extends Controller
-{
-    use FluidbookConvert;
-    use FluidbookPreview;
-
-    protected function index($tool, $args = '')
-    {
-
-        if (!$args) {
-            $args = [];
-        } else {
-            $args = explode('/', $args);
-        }
-
-        if (!method_exists($this, $tool)) {
-            return view('tools.' . $tool, ['args' => $args]);
-        }
-        return $this->$tool($args);
-    }
-}

diff --git a/app/Http/Controllers/Admin/TourCrudController.php b/app/Http/Controllers/Admin/TourCrudController.php
new file mode 100644 (file)
index 0000000..cd27d30
--- /dev/null
+++ b/app/Http/Controllers/Admin/TourCrudController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class TourCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+{
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
+       use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+       use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+       use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       
+
+
+    /*
+       __('visite guidée')
+       __('visites guidées')
+       */
+
+    protected $_modelNamespace = 'App\Models\Tour';
+    protected $_routeURL = 'tour';
+    protected $_singular = 'visite guidée';
+    protected $_plural = 'visites guidées';
+    protected $_oneInstance= true;
+}

diff --git a/app/Http/Controllers/Tools/Search.php b/app/Http/Controllers/Tools/Search.php
new file mode 100644 (file)
index 0000000..c31c018
--- /dev/null
+++ b/app/Http/Controllers/Tools/Search.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers\Tools;
+
+trait Search
+{
+    protected function fluidbookconvert($args)
+    {
+        return view('tools.search');
+    }
+}

diff --git a/app/Http/Controllers/ToolsController.php b/app/Http/Controllers/ToolsController.php
new file mode 100644 (file)
index 0000000..5f68511
--- /dev/null
+++ b/app/Http/Controllers/ToolsController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Tools\FluidbookConvert;
+
+class ToolsController
+{
+    use FluidbookConvert;
+
+    protected function index($tool, $args = '')
+    {
+
+        if (!$args) {
+            $args = [];
+        } else {
+            $args = explode('/', $args);
+        }
+
+        if (!method_exists($this, $tool)) {
+            return view('tools.' . $tool, ['args' => $args]);
+        }
+        return $this->$tool($args);
+    }
+}

diff --git a/app/Jobs/ProcessFluidbook.php b/app/Jobs/ProcessFluidbook.php
index 3bbf0984c71dbdab35c2f8baa37fa945f857dc43..f473af481051cc53932863c4530152f7f6c8007d 100644 (file)
--- a/app/Jobs/ProcessFluidbook.php
+++ b/app/Jobs/ProcessFluidbook.php
@@ -20,6 +20,9 @@ class ProcessFluidbook extends Compiler
     public function __construct()
     {
         $this->pub = Publication::find(1);
+        if (null === $this->pub) {
+            return;
+        }
 
         /** @var Media $media */
         $media = $this->pub->getMediaInField($this->pub->getAttributeValue('document'))->first();
@@ -66,7 +69,7 @@ class ProcessFluidbook extends Compiler
     protected function _getAssetCollection($id)
     {
         /** @var Asset $asset */
-        $asset = Asset::find($id);
+        $asset = Asset::createdok()->find($id);
         if (null === $asset) {
             throw new \Exception('L\'élement ' . $id . ' n\'existe pas dans la médiathèque');
         }

diff --git a/app/Jobs/SearchIndex.php b/app/Jobs/SearchIndex.php
index 517612dd3edd04a41f7c4be2c5e248be329021f9..110d11000b8ce780810a0a47b9dd61e4b5d39e11 100644 (file)
--- a/app/Jobs/SearchIndex.php
+++ b/app/Jobs/SearchIndex.php
@@ -34,17 +34,9 @@ class SearchIndex extends Index
 
     public function indexLibrary()
     {
-        $indexableTypes = ['audio', 'video'];
-
-        $assets = Asset::all();
+        $assets = Asset::createdok()->whereNotNull('theme')->whereIn('type', ['audio', 'video']);
         foreach ($assets as $asset) {
             $data = $asset->getPageData();
-            if (!in_array($data->get('type'), $indexableTypes)) {
-                continue;
-            }
-            if (!$data->get('theme')) {
-                continue;
-            }
             $doc = new Document();
             $doc->setType($data->get('type'));
             $doc->setId('media_' . $data->get('type') . '_' . $data->get('id'));