From 6e8f96f25432089f092f4f87c29c6d8fa241473a Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 3 Nov 2021 13:13:32 +0100
Subject: [PATCH] wip #4857 @1

---
 app/Models/FluidbookIconset.php                            | 3 ++-
 app/Models/FluidbookTheme.php                              | 7 +++----
 .../vendor/backpack/base/inc/sidebar_content.blade.php     | 6 +++++-
 .../vendor/backpack/crud/inc/form_save_buttons.blade.php   | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/Models/FluidbookIconset.php b/app/Models/FluidbookIconset.php
index 2d0f9e320..0b1ae6a86 100644
--- a/app/Models/FluidbookIconset.php
+++ b/app/Models/FluidbookIconset.php
@@ -58,6 +58,7 @@ class FluidbookIconset extends CubistMagicAbstractModel
             'name' => 'icons',
             'label' => __('Icons'),
             'type' => Code::class,
-            'language' => 'xml']);
+            'language' => 'xml',
+            'default' => '<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"></svg>']);
     }
 }
diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php
index 89832b63a..3dee27ec9 100644
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@ -9,6 +9,7 @@ use App\Jobs\GenerateThemePreview;
 use App\Jobs\UpdateWS2ThemeTable;
 use Cubist\Backpack\Magic\Fields\Color;
 use Cubist\Backpack\Magic\Fields\Files;
+use Cubist\Backpack\Magic\Fields\SelectFromModel;
 use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
@@ -219,10 +220,8 @@ class FluidbookTheme extends CubistMagicAbstractModel
         ]);
         $this->addField([
             'name' => 'iconSet',
-            'type' => 'SelectFromArray',
-            'options' => [
-                15 => 'Jeu d\'icônes par défaut',
-            ],
+            'type' => SelectFromModel::class,
+            'optionsmodel' => FluidbookIconset::class,
             'label' => __('Jeu d\'icônes'),
             'default' => 15,
             'translatable' => false,
diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
index e403e14ad..b720b08ea 100644
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -18,7 +18,7 @@
     </li>
 @endcanany
 
-@canany(['fluidbook-quote:read','signature:read','fluidbook-theme:read','fluibook-translate:write'])
+@canany(['fluidbook-quote:read','signature:read','fluidbook-theme:read','fluidbook-iconset:read','fluibook-translate:write'])
     <li class='nav-item nav-dropdown open'><a class='nav-link nav-dropdown-toggle' href='#'><i
                 class="nav-icon la"><img src="/images/icons/icon-fluidbook.svg"/></i>{{__('Fluidbook')}}</a>
         <ul class='nav-dropdown-items'>
@@ -30,6 +30,10 @@
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('fluidbook-theme') }}"><i
                             class="la la-palette nav-icon"></i> {{__('Thèmes')}}</a></li>
             @endcan
+            @can('fluidbook-iconset:read')
+                <li class="nav-item"><a class="nav-link" href="{{ backpack_url('fluidbook-iconset') }}"><i
+                            class="la la-icons nav-icon"></i> {{__('Jeux d\'icônes')}}</a></li>
+            @endcan
             @can('fluibook-translate:write')
                 <li class="nav-item"><a class="nav-link"
                                         href='{{ backpack_url('fluidbook-translate/1/edit/?locale=en') }}'><i
diff --git a/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php b/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php
index e13390b58..13bb34cce 100644
--- a/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php
+++ b/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php
@@ -35,7 +35,7 @@
                 @if(!empty($saveAction['options']))
             </div>
         @endif
-        @if($crud->entry && $crud->entry instanceof \Cubist\Backpack\Magic\Models\CubistMagicAbstractModel)s
+        @if($crud->entry && $crud->entry instanceof \Cubist\Backpack\Magic\Models\CubistMagicAbstractModel)
             @foreach($crud->entry->getEditActions() as $view)
                 @include($view)
             @endforeach
-- 
2.39.5