patch

exatech-group · Sep 2, 2019 · b696f1b · b696f1b
1 parent 05737cc
commit b696f1b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 9 deletions.
diff --git a/config/laravel-h5p.php b/config/laravel-h5p.php
@@ -25,10 +25,10 @@
     // Content screen setting
     'h5p_show_display_option'    => true,
     'h5p_frame'                  => true,
-    'h5p_export'                 => true,
-    'h5p_embed'                  => true,
+    'h5p_export'                 => false,
+    'h5p_embed'                  => false,
     'h5p_copyright'              => false,
-    'h5p_icon'                   => true,
+    'h5p_icon'                   => false,
     'h5p_track_user'             => false,
     'h5p_ext_communication'      => true,
     'h5p_save_content_state'     => false,
@@ -39,5 +39,5 @@
     'h5p_content_type_cache_updated_at' => 0,
     'h5p_check_h5p_requirements'        => false,
     'h5p_hub_is_enabled'                => false,
-    'h5p_version'                       => '1.22.0',
+    'h5p_version'                       => '1.23.0',
 ];
diff --git a/lang/en/laravel-h5p.php b/lang/en/laravel-h5p.php
@@ -109,5 +109,8 @@
         'confirmDialogBody'     => 'Please confirm that you wish to proceed. This action is not reversible.',
         'cancelLabel'           => 'Cancel',
         'confirmLabel'          => 'Confirm',
+        'reuse'                 => 'Reuse',
+        'reuseDescription'      => 'Reuse this content',
+        'reuseContent'          => 'Reuse content',
     ],
 ];
diff --git a/lang/fr/laravel-h5p.php b/lang/fr/laravel-h5p.php
@@ -100,5 +100,8 @@
         'confirmDialogBody'     => 'Veuillez confirmer que vous souhaitez continuer. Cette action n\'est pas réversible.',
         'cancelLabel'           => 'Annuler',
         'confirmLabel'          => 'Confirmer',
+        'reuse'                 => 'Reuse',
+        'reuseDescription'      => 'Reuse this content',
+        'reuseContent'          => 'Reuse content',
     ],
 ];
diff --git a/src/LaravelH5p/LaravelH5pServiceProvider.php b/src/LaravelH5p/LaravelH5pServiceProvider.php
@@ -108,7 +108,7 @@ public function boot(\Illuminate\Routing\Router $router)
             app_path('/../vendor/h5p/h5p-editor/ckeditor') => storage_path('app/public/h5p/h5p-editor/ckeditor'),
             app_path('/../vendor/h5p/h5p-editor/images')   => storage_path('app/public/h5p/h5p-editor/images'),
             app_path('/../vendor/h5p/h5p-editor/language') => storage_path('app/public/h5p/h5p-editor/language'),
-            app_path('/../vendor/h5p/h5p-editor/libs')     => storage_path('app/public/h5p/h5p-editor/libs'),
+            app_path('/../vendor/h5p/h5p-editor/libs')     => storage_path('app/public/h5p/h5p-editorlibs'),//menchi maj chemin
             app_path('/../vendor/h5p/h5p-editor/scripts')  => storage_path('app/public/h5p/h5p-editor/scripts'),
             app_path('/../vendor/h5p/h5p-editor/styles')   => storage_path('app/public/h5p/h5p-editor/styles'),
         ], 'public');

diff --git a/src/LaravelH5p/Repositories/LaravelH5pRepository.php b/src/LaravelH5p/Repositories/LaravelH5pRepository.php
@@ -608,8 +608,6 @@ public function loadContent($id)
         JOIN h5p_libraries hl ON hl.id = hc.library_id
         WHERE hc.id = ?', [$id]);
 
-        //$return[0]->metadata = '';//TODO menchi
-
         $content = (array) array_shift($return);
 
         if (isset($content['metadata'])) {

diff --git a/src/LaravelH5p/Storages/LaravelH5pStorage.php b/src/LaravelH5p/Storages/LaravelH5pStorage.php
@@ -458,7 +458,7 @@ public function removeContentFile($file, $contentId)
     {
         $path = "{$this->path}/content/{$contentId}/{$file}";
         if (file_exists($path)) {
-            unlink($path);
+             //unlink($path);//TODO à patcher : commenté Menchi, supprime les fichiers que l'on vient de rajouter dans le content...
         }
     }
 

diff --git a/views/h5p/content/create.blade.php b/views/h5p/content/create.blade.php
@@ -1,5 +1,8 @@
 @extends( config('laravel-h5p.layout') )
 
+@if(!isset($errors))
+@php $errors = collect();@endphp
+@endif
 @section( 'h5p' )
 <div class="container-fluid">
 

diff --git a/views/h5p/content/edit.blade.php b/views/h5p/content/edit.blade.php
@@ -1,6 +1,8 @@
 @extends( config('laravel-h5p.layout') )
 
-
+@if(!isset($errors))
+@php $errors = collect();@endphp
+@endif
 @section( 'h5p' )
 <div class="container-fluid">