wait #5509 @0.5

diff --git a/resources/views/fields/fluidbook_composition.blade.php b/resources/views/fields/fluidbook_composition.blade.php
index 376c01d28a9242c30f86d6c6765b438fea20072f..f4385bb51cbc8896722c924efc9df6ad156852fd 100644 (file)
--- a/resources/views/fields/fluidbook_composition.blade.php
+++ b/resources/views/fields/fluidbook_composition.blade.php
@@ -9,12 +9,12 @@
                 var selected = [];
 
                 function initPages() {
-                    var data=[];
-                    var numbers=[];
-                    var sizes=[];
-                    var vectors=[];
-                    var rasters=[];
-                    if($("#compositionField").val()!=='') {
+                    var data = [];
+                    var numbers = [];
+                    var sizes = [];
+                    var vectors = [];
+                    var rasters = [];
+                    if ($("#compositionField").val() !== '') {
                         data = JSON.parse($("#compositionField").val());
                         numbers = $('input[name="page_numbers"]').val().split(',');
                         sizes = $("#compositionField").data('doc-sizes');
@@ -214,6 +214,7 @@
                             putDocumentInComposition(conversionDocument, data.pages, data.numbers, data.size, conversionOperation, conversionPages);
                         }
                     });
+                    $("#saveActions [disabled]").prop('disabled', false);
                 }
 
                 function hideProgressBar() {

diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/preview.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/preview.blade.php
index 2891f216af89044b9da73e061a7729c0d3b48c5c..fbb75d090e0c3c692e3b43401a696c0aad86d951 100644 (file)
--- a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/preview.blade.php
+++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/preview.blade.php
@@ -1,7 +1,7 @@
 @php
-    $actions=['preview'=>['label'=>__('Version online'),'url'=>$crud->route.'/preview/$id_'.$entry->hash,'target'=>'_blank']];
+    $actions=['preview'=>['label'=>__('Version online'),'url'=>$crud->route.'/preview/'.$entry->getKey().'_'.$entry->hash,'target'=>'_blank']];
     if($entry->isSCORMEnabled()){
-        $actions['scorm']=['label'=>__('Version SCORM'),'url'=>$crud->route.'/preview/scorm/$id_'.$entry->hash,'target'=>'_blank'];
+        $actions['scorm']=['label'=>__('Version SCORM'),'url'=>$crud->route.'/preview/scorm/'.$entry->getKey().'_'.$entry->hash,'target'=>'_blank'];
     }
 @endphp