From e1fdfa854518ce07f26f29aa29cbda362bfffab3 Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 19 Jul 2023 17:41:45 +0200
Subject: [PATCH] Multiple bug fixes

---
 lib/Routes/Playlist/PlaylistUpdate.php               |  3 +++
 lib/Routes/Video/VideoCopyToCourse.php               |  7 ++++---
 vueapp/components/Error.vue                          |  7 ++++++-
 vueapp/components/SearchBar.vue                      | 11 +++++++++++
 vueapp/components/UserCourseSelectable.vue           |  6 +++---
 vueapp/components/Videos/Actions/CaptionUpload.vue   |  4 ++++
 .../Videos/Actions/VideoAccess/ShareWithUsers.vue    |  4 ++--
 .../components/Videos/Actions/VideoCopyToSeminar.vue | 12 +++++++-----
 vueapp/components/Videos/VideoCard.vue               |  8 +++-----
 vueapp/components/Videos/VideoUpload.vue             |  5 ++++-
 vueapp/components/Videos/VideosList.vue              |  2 +-
 vueapp/store/playlists.module.js                     |  9 ++++++++-
 12 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/lib/Routes/Playlist/PlaylistUpdate.php b/lib/Routes/Playlist/PlaylistUpdate.php
index b6410e0b3..aacbf319b 100644
--- a/lib/Routes/Playlist/PlaylistUpdate.php
+++ b/lib/Routes/Playlist/PlaylistUpdate.php
@@ -66,6 +66,9 @@ public function __invoke(Request $request, Response $response, $args)
         $playlist->setData($json);
         $playlist->store();
 
+        $playlist['mkdate'] = ($playlist['mkdate'] == '0000-00-00 00:00:00') 
+            ? 0 : \strtotime($playlist['mkdate']);
+
         $ret_playlist = $playlist->toSanitizedArray();
         $ret_playlist['users'] = [[
             'user_id'  => $user->id,
diff --git a/lib/Routes/Video/VideoCopyToCourse.php b/lib/Routes/Video/VideoCopyToCourse.php
index fae1303c1..d9b589ed1 100644
--- a/lib/Routes/Video/VideoCopyToCourse.php
+++ b/lib/Routes/Video/VideoCopyToCourse.php
@@ -52,9 +52,10 @@ public function __invoke(Request $request, Response $response, $args)
                                 // if this is the courses default playlist, copy the videos to the new courses default playlist
                                 if ($playlist->is_default) {
                                     $default_playlist = Helpers::checkCoursePlaylist($course['id']);
-                                    $stmt = DBManager::get()->prepare("INSERT INTO oc_playlist_video (playlist_id, video, order)
-                                        SELECT :target, video, order, FROM oc_playlist_video
-                                             WHERE playlist_id = :source");
+                                    $stmt = \DBManager::get()->prepare("INSERT INTO oc_playlist_video (playlist_id, video_id, `order`)
+                                        SELECT :target, video_id, `order` FROM oc_playlist_video
+                                            WHERE playlist_id = :source
+                                            AND NOT EXISTS (Select * FROM oc_playlist_video WHERE playlist_id = :target)");
                                     $stmt->execute([
                                         ':target' => $default_playlist->id,
                                         ':source' => $playlist->id
diff --git a/vueapp/components/Error.vue b/vueapp/components/Error.vue
index ed0b70fc0..c657d0baa 100644
--- a/vueapp/components/Error.vue
+++ b/vueapp/components/Error.vue
@@ -1,5 +1,8 @@
 <template>
-    <div v-if="errors.length">
+    <div v-if="errors.length"
+        :class="{
+            'oc--messages-float': float
+        }">
         <div class="messagebox messagebox_error"
             v-for="error in errors"
             v-bind:key="error">
@@ -45,6 +48,8 @@ import { mapGetters } from "vuex";
 export default {
     name: "Error",
 
+    props: ['float'],
+
     computed: {
         ...mapGetters(["errors"])
     },
diff --git a/vueapp/components/SearchBar.vue b/vueapp/components/SearchBar.vue
index a5a370db0..6828a795a 100644
--- a/vueapp/components/SearchBar.vue
+++ b/vueapp/components/SearchBar.vue
@@ -13,6 +13,11 @@
             </li>
             <li class="oc--searchbar-token" v-if="token && token.type">
                  {{ token.type_name }} {{ token.compare }} {{ token.value_name }}
+                 <studip-icon
+                    shape="decline" role="info" class="oc--remove-filter"
+                    @click="removeTokenSelect"
+                    @blur="delayedHideTokenSelector"
+                />
             </li>
             <li class="oc--searchbar-input">
                 <input type="text" ref="searchbar"
@@ -245,6 +250,12 @@ export default {
             this.doSearch();
         },
 
+        removeTokenSelect() {
+            this.token = null;
+            this.tokenState = 'main';
+            this.hideTokenSelector();
+        },
+
         doSearch() {
             let filters = JSON.parse(JSON.stringify(this.searchTokens));
 
diff --git a/vueapp/components/UserCourseSelectable.vue b/vueapp/components/UserCourseSelectable.vue
index 42e8e284b..1f54f8faf 100644
--- a/vueapp/components/UserCourseSelectable.vue
+++ b/vueapp/components/UserCourseSelectable.vue
@@ -29,7 +29,7 @@
                 icon="accept"
                 @click.prevent="returnSelectedCourse()"
             >
-                {{ $gettext('Kurse auswählen') }}
+                {{ $gettext('Kurs auswählen') }}
             </StudipButton>
         </footer>
     </form>
@@ -74,7 +74,7 @@ export default {
             }];
 
             if (this.courses.length == 0) {
-                this.currentCourse = 0;
+                this.currentCourse = null;
                 return noCoursesFound;
             }
 
@@ -108,7 +108,7 @@ export default {
             }
 
             if (Object.keys(course_list).length == 0) {
-                this.currentCourse = 0;
+                this.currentCourse = null;
                 return noCoursesFound;
             }
 
diff --git a/vueapp/components/Videos/Actions/CaptionUpload.vue b/vueapp/components/Videos/Actions/CaptionUpload.vue
index 0102bfb8e..9663913dc 100644
--- a/vueapp/components/Videos/Actions/CaptionUpload.vue
+++ b/vueapp/components/Videos/Actions/CaptionUpload.vue
@@ -81,6 +81,8 @@
                         <ProgressBar v-if="uploadProgress && uploadProgress.flavor == language.flavor" :progress="uploadProgress.progress" />
                     </div>
 
+                    <Error :float="true" />
+
                     <MessageBox v-if="fileUploadError" type="error">
                         {{ $gettext('Sie müssen mindestens eine Datei auswählen!') }}
                     </MessageBox>
@@ -96,6 +98,7 @@ import { mapGetters } from 'vuex';
 import StudipDialog from '@studip/StudipDialog'
 import StudipButton from '@studip/StudipButton'
 import MessageBox from '@/components/MessageBox'
+import Error from "@/components/Error";
 import ProgressBar from '@/components/ProgressBar'
 import UploadService from '@/common/upload.service'
 
@@ -105,6 +108,7 @@ export default {
     components: {
         StudipDialog,
         MessageBox,
+        Error,
         StudipButton,
         ProgressBar,
     },
diff --git a/vueapp/components/Videos/Actions/VideoAccess/ShareWithUsers.vue b/vueapp/components/Videos/Actions/VideoAccess/ShareWithUsers.vue
index 62b145567..2ca6951be 100644
--- a/vueapp/components/Videos/Actions/VideoAccess/ShareWithUsers.vue
+++ b/vueapp/components/Videos/Actions/VideoAccess/ShareWithUsers.vue
@@ -99,7 +99,7 @@ export default {
     data()
     {
         return {
-            selectedUser: {},
+            selectedUser: null,
             selectedUserPerm: null,
         }
     },
@@ -155,7 +155,7 @@ export default {
                 this.selectedUser.perm = this.selectedUserPerm;
                 this.$emit('add', this.selectedUser);
 
-                this.selectedUser = {};
+                this.selectedUser = null;
                 this.selectedUserPerm = null;
             }
         }
diff --git a/vueapp/components/Videos/Actions/VideoCopyToSeminar.vue b/vueapp/components/Videos/Actions/VideoCopyToSeminar.vue
index 420551869..268d2f3e5 100644
--- a/vueapp/components/Videos/Actions/VideoCopyToSeminar.vue
+++ b/vueapp/components/Videos/Actions/VideoCopyToSeminar.vue
@@ -76,11 +76,13 @@ export default {
         ...mapGetters(['userCourses', 'cid', 'courseVideosToCopy']),
 
         user_courses_filtered() {
-            let userCoursesFiltered = this.userCourses;
-            for (let semester_code in userCoursesFiltered) {
-                for (let semester in userCoursesFiltered[semester_code]) {
-                    if (Array.isArray(userCoursesFiltered[semester_code][semester])) {
-                        let filtered = userCoursesFiltered[semester_code][semester].filter(course => course.id != this.cid);
+            let userCoursesFiltered = {};
+            for (let semester_code in this.userCourses) {
+                userCoursesFiltered[semester_code] = {};
+                for (let semester in this.userCourses[semester_code]) {
+                    if (Array.isArray(this.userCourses[semester_code][semester])) {
+                        let filtered = this.userCourses[semester_code][semester].filter(
+                            course => course.id != this.cid && !this.courses.includes(course));
                         userCoursesFiltered[semester_code][semester] = filtered;
                     }
                 }
diff --git a/vueapp/components/Videos/VideoCard.vue b/vueapp/components/Videos/VideoCard.vue
index 2effb7d43..ad6e3f07a 100644
--- a/vueapp/components/Videos/VideoCard.vue
+++ b/vueapp/components/Videos/VideoCard.vue
@@ -209,13 +209,11 @@ export default {
                 if (this.canEdit) {
                     return true;
                 }
-
-                let playlist_download = this.playlist['allow_download'];
-                if (playlist_download === null) {
-                    return this.downloadSetting === 'allow';
+                else if (this.playlist && this.playlist['allow_download']) {
+                    return this.playlist['allow_download'];
                 }
                 else {
-                    return playlist_download;
+                    return this.downloadSetting === 'allow';
                 }
             }
             return false;
diff --git a/vueapp/components/Videos/VideoUpload.vue b/vueapp/components/Videos/VideoUpload.vue
index cc8136555..f3e5fb12f 100644
--- a/vueapp/components/Videos/VideoUpload.vue
+++ b/vueapp/components/Videos/VideoUpload.vue
@@ -183,6 +183,8 @@
                             Medien, bei denen Urheberrechtsverstöße vorliegen, werden ohne vorherige Ankündigung umgehend gelöscht.
                     </MessageBox>
                 </form>
+
+                <Error :float="true"/>
             </template>
         </StudipDialog>
     </div>
@@ -193,6 +195,7 @@ import { mapGetters } from 'vuex';
 
 import StudipDialog from '@studip/StudipDialog'
 import StudipButton from '@studip/StudipButton'
+import Error from "@/components/Error";
 import MessageBox from '@/components/MessageBox'
 import VideoFilePreview from '@/components/Videos/VideoFilePreview'
 import ProgressBar from '@/components/ProgressBar'
@@ -206,6 +209,7 @@ export default {
 
     components: {
         StudipDialog,
+        Error,
         MessageBox,
         StudipButton,
         VideoFilePreview,
@@ -329,7 +333,6 @@ export default {
             }
 
             uploadData['created']  = new Date(this.upload.recordDate).toISOString(),
-            delete uploadData['recordDate'];
 
             uploadData['oc_acl']   = this.uploadService.uploadACL();
 
diff --git a/vueapp/components/Videos/VideosList.vue b/vueapp/components/Videos/VideosList.vue
index 54fc9e39d..a10cefe2a 100644
--- a/vueapp/components/Videos/VideosList.vue
+++ b/vueapp/components/Videos/VideosList.vue
@@ -5,7 +5,7 @@
         </MessageBox>
         <h3 v-if="playlistForVideos">
             {{ playlistForVideos.title }}
-            <div class="oc--tags">
+            <div class="oc--tags oc--tags-playlist">
                 <Tag v-for="tag in playlistForVideos.tags" v-bind:key="tag.id" :tag="tag.tag" />
             </div>
         </h3>
diff --git a/vueapp/store/playlists.module.js b/vueapp/store/playlists.module.js
index 3c3f06de1..a217069c7 100644
--- a/vueapp/store/playlists.module.js
+++ b/vueapp/store/playlists.module.js
@@ -86,7 +86,7 @@ const actions = {
     async updatePlaylist(context, playlist) {
         return ApiService.put('playlists/' + playlist.token, playlist)
             .then(({ data }) => {
-                context.commit('setPlaylists', [data]);
+                context.commit('updatePlaylist', data);
             });
     },
 
@@ -176,6 +176,13 @@ const actions = {
 }
 
 const mutations = {
+    updatePlaylist(state, playlist) {
+        let idx = state.playlists.findIndex(p => p.token === playlist.token);
+        if (idx > -1) {
+            state.playlists[idx] = playlist;
+        }
+    },
+
     setPlaylists(state, playlists) {
         state.playlists = playlists;
     },