Correctly consider global default visibility of videos (#1302)

* Correctly consider global default visibility of videos

* use correct sql

Author: tgloeggl

assets/css/opencast.scss

@@ -362,6 +362,14 @@ $action-menu-icon-size: 20px;
     opacity: 0.7;
 }
 
+.oc--episode--invisible {
+    background-color: #FFFFCC;
+}
+
+.oc--title--invisible-info {
+    font-size: 0.8em;
+}
+
 .oc--loadingbar {
     border-radius: 15px;
     background-color: darken($episode-background, 20%);

lib/Models/Videos.php

@@ -109,9 +109,7 @@ public static function getPlaylistVideos($playlist_id, $filters)
             $sql .= ' INNER JOIN oc_playlist_seminar AS ops ON (ops.seminar_id = :cid AND ops.playlist_id = opv.playlist_id)'.
                     ' LEFT JOIN oc_playlist_seminar_video AS opsv ON (opsv.playlist_seminar_id = ops.id AND opsv.video_id = opv.video_id)';
 
-            $where = ' WHERE (opsv.visibility IS NULL AND opsv.visible_timestamp IS NULL AND ops.visibility = "visible"
-                       OR opsv.visibility = "visible" AND opsv.visible_timestamp IS NULL
-                       OR opsv.visible_timestamp < NOW()) ';
+            $where = ' WHERE '. self::getVisibilitySql();
 
             $params[':cid'] = $cid;
         }
@@ -152,9 +150,7 @@ public static function getCourseVideos($course_id, $filters)
         if (!$perm->have_studip_perm($required_course_perm, $course_id)) {
             $sql .= ' LEFT JOIN oc_playlist_seminar_video AS opsv ON (opsv.playlist_seminar_id = ops.id AND opsv.video_id = opv.video_id)';
 
-            $where = ' WHERE (opsv.visibility IS NULL AND opsv.visible_timestamp IS NULL AND ops.visibility = "visible"
-                       OR opsv.visibility = "visible" AND opsv.visible_timestamp IS NULL
-                       OR opsv.visible_timestamp < NOW()) ';
+            $where = ' WHERE '. self::getVisibilitySql();
         }
 
         $query = [
@@ -166,6 +162,23 @@ public static function getCourseVideos($course_id, $filters)
         return self::getFilteredVideos($query, $filters);
     }
 
+    private static function getVisibilitySql()
+    {
+        // if each video has to explicitly set to visible, filter out everything else
+        if (\Config::get()->OPENCAST_HIDE_EPISODES) {
+            return '(
+                (opsv.visibility = "visible" AND opsv.visible_timestamp IS NULL)
+                OR (opsv.visible_timestamp < NOW())
+            )';
+        } else {
+            return '(
+                (opsv.visibility IS NULL AND opsv.visible_timestamp IS NULL AND ops.visibility = "visible")
+                OR (opsv.visibility = "visible" AND opsv.visible_timestamp IS NULL)
+                OR (opsv.visible_timestamp < NOW())
+            )';
+        }
+    }
+
     /**
      * Get the list of videos where the user has owner perm, faceted by the passed filters
      *
@@ -484,9 +497,7 @@ public static function getNumberOfNewCourseVideos($course_id, $last_visit, $user
         if (!$perm->have_perm('dozent', $user_id)) {
             $sql .= ' LEFT JOIN oc_playlist_seminar_video AS opsv ON (opsv.playlist_seminar_id = ops.id AND opsv.video_id = opv.video_id)';
 
-            $where .= ' AND (opsv.visibility IS NULL AND opsv.visible_timestamp IS NULL AND ops.visibility = "visible"
-                       OR opsv.visibility = "visible" AND opsv.visible_timestamp IS NULL
-                       OR opsv.visible_timestamp < NOW()) ';
+            $where .= ' AND '. self::getVisibilitySql();
         }
 
         $sql .= $where;

vueapp/components/Videos/VideoRow.vue

@@ -1,5 +1,8 @@
 <template>
-    <tr class="oc--episode" v-if="event.refresh === undefined" :key="event.id" ref="videoRow">
+    <tr class="oc--episode" v-if="event.refresh === undefined" :key="event.id" ref="videoRow"
+        :class="{
+            'oc--episode--invisible': !isVisible(event)
+        }">
         <td v-if="canEdit && videoSortMode">
             <a class="dragarea" title="$gettextInterpolate($gettext('Video per Drag & Drop verschieben'))">
                 <img class="oc--drag-handle"
@@ -54,7 +57,7 @@
                             <span class="tooltip-content">
                                 {{ $gettext('Aufrufe') }}
                             </span>
-                            <studip-icon shape="visibility-visible" role="info_alt"></studip-icon>
+                            <studip-icon :shape="isVisible(event) ? 'visibility-visible' : 'visibility-invisible'" role="info_alt"></studip-icon>
                             {{ event.views }}
                         </span>
                         <span class="oc--duration">
@@ -95,6 +98,9 @@
         </td>
 
         <td class="oc--metadata-title">
+            <div v-if="!isVisible(event)" class="oc--title--invisible-info">
+                {{ $gettext('(Video ist unsichtbar für Studierende)') }}
+            </div>
             <div class="oc--title-container">
                 <a v-if="isLivestream && livestreamInfo.isLive"
                    href="#" @click.prevent="redirectAction(`/livestream/` + event.token)" target="_blank">
@@ -343,6 +349,22 @@ export default {
                     video_row.lastElementChild.setAttribute('colspan', colspan);
                 }
             }
+        },
+
+        isVisible(event) {
+            if (event.seminar_visibility === null || event.seminar_visibility === undefined) {
+                if (this.simple_config_list.settings.OPENCAST_HIDE_EPISODES) {
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+
+            if (event.seminar_visibility?.visibility == 'visible') {
+                return true;
+            }
+
+            return false;
         }
     },