Merge branch 'v1.8.2' into 'main'

Update class.xvmpGUI.php... See merge request fluxlabs/ilias/plugins/RepositoryObjects/ViMP!52
fluxapps · Apr 1, 2022 · 6afc59e · 6afc59e
2 parents afa8050 + 29141ec
commit 6afc59e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.8.2]
+- fix: time link in modal - additional fix: https://git.fluxlabs.ch/fluxlabs/ilias/plugins/RepositoryObjects/ViMP/-/issues/2
+- fix: wrong not available hint - additional fix: https://git.fluxlabs.ch/fluxlabs/ilias/plugins/RepositoryObjects/ViMP/-/issues/1
+
 ## [1.8.1]
 - fix: time link in modal: https://git.fluxlabs.ch/fluxlabs/ilias/plugins/RepositoryObjects/ViMP/-/issues/2
 - fix: wrong not available hint: https://git.fluxlabs.ch/fluxlabs/ilias/plugins/RepositoryObjects/ViMP/-/issues/1

diff --git a/classes/GUI/Abstract/class.xvmpGUI.php b/classes/GUI/Abstract/class.xvmpGUI.php
@@ -72,12 +72,7 @@ protected function getAccessDeniedModal() : ilModalGUI
         $modal = ilModalGUI::getInstance();
         $modal->setId('xvmp_modal_player');
         $modal->setType(ilModalGUI::TYPE_LARGE);
-        if (xvmp::is54()) {
-            $modal->setBody($this->dic->ui()->renderer()->render($this->dic->ui()->factory()->messageBox()->failure($this->pl->txt('access_denied'))));
-        } else {
-            $modal->setBody($this->dic->ui()->mainTemplate()->getMessageHTML($this->pl->txt('access_denied'),
-                "failure"));
-        }
+        $modal->setBody($this->dic->ui()->renderer()->render($this->dic->ui()->factory()->messageBox()->failure($this->pl->txt('access_denied'))));
         return $modal;
     }
 
@@ -311,8 +306,12 @@ public function fillModalPlayer($play_video_id = null, bool $async = true) {
         $playModalDto = $this->buildPlayerContainerDTO($video);
 
         $response = new stdClass();
-		$response->html = $this->renderer_factory->playerModal()->render($playModalDto, $async, ($this instanceof xvmpVideosGUI)); // TODO: change!
-		$response->video_title = $video->getTitle();
+        // TODO: Abstract classes MUST NOT know their children. this is a cognitive overload
+        // Refactoring Issue: https://git.fluxlabs.ch/fluxlabs/ilias/plugins/RepositoryObjects/ViMP/-/issues/3
+        $show_unavailable = ($this instanceof xvmpVideosGUI) || ($this instanceof xvmpContentGUI);
+        $response->html = $this->renderer_factory->playerModal()->render($playModalDto, $async, $show_unavailable);
+
+        $response->video_title = $video->getTitle();
 		/** @var xvmpUserProgress $progress */
 		$progress = xvmpUserProgress::where(array(xvmpUserProgress::F_USR_ID => $this->dic->user()->getId(), xvmpMedium::F_MID => $mid))->first();
 		if ($progress) {

diff --git a/plugin.php b/plugin.php
@@ -1,6 +1,6 @@
 <?php
 $id = 'xvmp';
-$version = '1.8.1';
+$version = '1.8.2';
 $ilias_min_version = '6.0';
 $ilias_max_version = '7.999';
 $responsible = 'fluxlabs ag';

diff --git a/templates/js/xvmp_content.js b/templates/js/xvmp_content.js
@@ -106,7 +106,9 @@ var VimpContent = {
   },
 
   copyDirectLinkWithTime: function (link_tpl) {
-    this.copyToClipboard(link_tpl.replace('_0.', '_' + Math.floor(player.currentTime()) + '.'));
+    let currentTime = '_' + Math.floor(player.currentTime());
+    let link = link_tpl.replace('_0.', currentTime + '.').replace('_0&', currentTime + '&');
+    this.copyToClipboard(link);
   },
 
   copyToClipboard: function (textToCopy) {

diff --git a/templates/js/xvmp_content.min.js b/templates/js/xvmp_content.min.js