Revert "fix #3019"

This reverts commit 185ab4a1.

app/views/contents/courseware/courseware.php

@@ -5,6 +5,7 @@
         entry-type="users"
         entry-id="<?= htmlReady($user_id) ?>"
         unit-id="<?= htmlReady($unit_id) ?>"
+        oer-enabled='<?= htmlReady($oer_enabled) ?>'
         licenses='<?= htmlReady($licenses) ?>'
         >
     </div>

app/views/contents/courseware/shared_content_courseware.php

@@ -3,6 +3,7 @@
     entry-element-id="<?= $entry_element_id ?>"
     entry-type="sharedusers"
     entry-id="<?= $entry_element_id ?>"
+    oer-enabled='<?= $oer_enabled ?>'
     oer-title="<?= Config::get()->OER_TITLE ?>"
     licenses='<?= $licenses ?>'
     >

app/views/course/courseware/courseware.php

@@ -5,6 +5,7 @@
         entry-type="courses"
         entry-id="<?= htmlReady(Context::getId()) ?>"
         unit-id="<?= htmlReady($unit_id) ?>"
+        oer-enabled='<?= htmlReady($oer_enabled) ?>'
         licenses='<?= htmlReady($licenses) ?>'
         >
     </div>

lib/classes/JsonApi/Models/Studip.php

@@ -13,8 +13,6 @@ class Studip
     {
         $properties = [
             new StudipProperty('studip-version', 'Stud.IP-Version', $GLOBALS['SOFTWARE_VERSION']),
-            new StudipProperty('oer-campus-enabled', 'OERCAMPUS_ENABLED', \Config::get()->OERCAMPUS_ENABLED),
-            new StudipProperty('oer-enable-suggestions', 'OER_ENABLE_SUGGESTIONS', \Config::get()->OER_ENABLE_SUGGESTIONS),
         ];
 
         $copyrightDialog = self::getConfigOption('COPYRIGHT_DIALOG_ON_UPLOAD');

resources/vue/components/courseware/CoursewareExportWidget.vue

@@ -40,7 +40,7 @@ export default {
     computed: {
         ...mapGetters({
             context: 'context',
-            oerCampusEnabled: 'oerCampusEnabled',
+            oerEnabled: 'oerEnabled',
             userIsTeacher: 'userIsTeacher',
         }),
         canEdit() {
@@ -64,7 +64,7 @@ export default {
             return this.canVisit;
         },
         showOer() {
-            if (!this.oerCampusEnabled) {
+            if (!this.oerEnabled) {
                 return false;
             }
 

resources/vue/components/courseware/CoursewareStructuralElement.vue

@@ -802,8 +802,7 @@ export default {
             showSuggestOerDialog: 'showSuggestOerDialog',
             showPublicLinkDialog: 'showStructuralElementPublicLinkDialog',
             showRemoveLockDialog: 'showStructuralElementRemoveLockDialog',
-            oerCampusEnabled: 'oerCampusEnabled',
-            oerEnableSuggestions: 'oerEnableSuggestions',
+            oerEnabled: 'oerEnabled',
             licenses: 'licenses',
             exportState: 'exportState',
             exportProgress: 'exportProgress',
@@ -1043,9 +1042,9 @@ export default {
                 { id: 5, label: this.$gettext('Lesezeichen setzen'), icon: 'star', emit: 'setBookmark' },
             ];
 
-            if (this.oerEnableSuggestions) {
+            if (this.oerEnabled) {
                 menu.push(
-                    { id: 6, label: this.$gettext('Seite für OER Campus vorschlagen'), icon: 'oer-campus',
+                    { id: 6, label: this.$gettext('Lerninhalt für OER Campus vorschlagen'), icon: 'oer-campus',
                         emit: 'showSuggest' }
                 );
             }

resources/vue/courseware-index-app.js

@@ -24,6 +24,7 @@ const mountApp = async (STUDIP, createApp, element) => {
     let entry_id = null;
     let entry_type = null;
     let unit_id = null;
+    let oer_enabled = null;
     let licenses = null;
     let elem;
 
@@ -45,6 +46,9 @@ const mountApp = async (STUDIP, createApp, element) => {
                 unit_id = elem.attributes['unit-id'].value;
             }
 
+            if (elem.attributes['oer-enabled'] !== undefined) {
+                oer_enabled = elem.attributes['oer-enabled'].value;
+            }
             // we need a route for License SORM
             if (elem.attributes['licenses'] !== undefined) {
                 licenses = JSON.parse(elem.attributes['licenses'].value);
@@ -115,22 +119,13 @@ const mountApp = async (STUDIP, createApp, element) => {
                     'sem-classes',
                     'sem-types',
                     'terms-of-use',
-                    'user-data-field',
-                    'studip-properties'
+                    'user-data-field'
                 ],
                 httpClient,
             }),
         },
     });
 
-    axios.get(
-        STUDIP.URLHelper.getURL('jsonapi.php/v1/studip/properties', {}, true)
-    ).then(response => {
-        response.data.data.forEach(prop => {
-            store.dispatch('studip-properties/storeRecord', prop);
-        });
-    });
-
     store.dispatch('setUrlHelper', STUDIP.URLHelper);
     store.dispatch('setUserId', STUDIP.USER_ID);
     await store.dispatch('users/loadById', {id: STUDIP.USER_ID});
@@ -149,6 +144,7 @@ const mountApp = async (STUDIP, createApp, element) => {
 
     store.dispatch('coursewareCurrentElement', elem_id);
 
+    store.dispatch('oerEnabled', oer_enabled);
     store.dispatch('licenses', licenses);
     store.dispatch('courseware-templates/loadAll');
     store.dispatch('loadUserClipboards', STUDIP.USER_ID);

resources/vue/store/courseware/courseware.module.js

@@ -8,6 +8,7 @@ const getDefaultState = () => {
         context: {},
         courseware: {},
         currentElement: {},
+        oerEnabled: null,
         licenses: null, // we need a route for License SORM
         httpClient: null,
         lastElement: null,
@@ -102,6 +103,9 @@ const getters = {
     currentStructuralElementImageURL(state, getters) {
         return getters.currentStructuralElement?.relationships?.image?.meta?.['download-url'];
     },
+    oerEnabled(state) {
+        return state.oerEnabled;
+    },
     licenses(state) {
         return state.licenses;
     },
@@ -254,13 +258,6 @@ const getters = {
     },
     progresses(state) {
         return state.progresses;
-    },
-
-    oerCampusEnabled(state, getters, rootState, rootGetters) {
-        return rootGetters['studip-properties/byId']({ id: 'oer-campus-enabled'}).attributes?.value;
-    },
-    oerEnableSuggestions(state, getters, rootState, rootGetters) {
-        return getters.oerCampusEnabled && rootGetters['studip-properties/byId']({ id: 'oer-enable-suggestions'}).attributes?.value;
     }
 };
 
@@ -810,6 +807,10 @@ export const actions = {
         context.commit('coursewareContextSet', id);
     },
 
+    oerEnabled(context, enabled) {
+        context.commit('oerEnabledSet', enabled);
+    },
+
     licenses(context, licenses) {
         context.commit('licensesSet', licenses);
     },
@@ -1419,6 +1420,10 @@ export const mutations = {
         state.context = data;
     },
 
+    oerEnabledSet(state, data) {
+        state.oerEnabled = data;
+    },
+
     licensesSet(state, data) {
         state.licenses = data;
     },