Merge pull request #5737 from christianbeeznest/ofaj-21604-2

Internal: Fix session visibility and assignment import issues - refs BT#21604

Author: christianbeeznest

assets/vue/components/assignments/TeacherAssignmentList.vue

@@ -26,7 +26,6 @@
     >
       <template #body="slotProps">
         <div class="flex items-center">
-          <BaseIcon v-if="isAllowedToEdit && getSessionId(slotProps.data)" icon="session-star" size="small" class="mr-2" />
           {{ slotProps.data.title }}
         </div>
       </template>

public/main/course_description/course_description_controller.php

@@ -85,6 +85,7 @@ public function listing($history = false, $messages = [])
                 'resourceNode' => $description->getResourceNode(),
                 'sessionId' => $description->getFirstResourceLink()->getSession() ? $description->getFirstResourceLink()->getSession()->getId() : null,
             ];
+            $description_data['icon_session'] = api_get_session_image($description->getFirstResourceLink()->getSession()?->getId(), api_get_user_entity());
             $data['descriptions'][] = $description_data;
         }
 
@@ -109,6 +110,8 @@ function confirmation(name) {
 
         $actions = self::getToolbar();
 
+
+
         $tpl = new Template(get_lang('Description'));
         $tpl->assign('listing', $data);
         $tpl->assign('is_allowed_to_edit', $is_allowed_to_edit);

public/main/forum/index.php

@@ -345,8 +345,7 @@ function hidecontent(content){
         } else {
         }*/
         //$forumCategoryInfo['extra_fields'] = $forumCategory['extra_fields'];
-        //$forumCategoryInfo['icon_session'] = api_get_session_image($categorySessionId, $_user['status']);
-        $forumCategoryInfo['icon_session'] = '';
+        $forumCategoryInfo['icon_session'] = api_get_session_image($forumCategory->getFirstResourceLink()->getSession()?->getId(), $user);
 
         // Validation when belongs to a session
         $forumCategoryInfo['description'] = $forumCategory->getCatComment();
@@ -450,11 +449,11 @@ function hidecontent(content){
                             }
                         }*/
                         // Validation when belongs to a session
-                        /*$forumInfo['icon_session'] = api_get_session_image(
-                            $forum->getSessionId(),
+                        $forumInfo['icon_session'] = api_get_session_image(
+                            $forum->getFirstResourceLink()->getSession()?->getId(),
                             $user
-                        );*/
-                        $forumInfo['icon_session'] = '';
+                        );
+                        //$forumInfo['icon_session'] = '';
                         if ('0' != $forum->getForumOfGroup()) {
                             $forumOfGroup = $forum->getForumOfGroup();
                             $my_all_groups_forum_name = $all_groups[$forumOfGroup]['name'] ?? null;

public/main/template/default/course_description/index.html.twig

@@ -8,7 +8,7 @@
                         <div>
                             {{ description.title }}
                             {% if description.sessionId %}
-                                <i class="mdi mdi-star text-yellow-500"></i>
+                                {{ description.icon_session }}
                             {% endif %}
                         </div>
                         {% if is_allowed_to_edit %}

src/CoreBundle/Controller/CourseController.php

@@ -85,8 +85,8 @@ public function checkTermsAndConditionJson(
         ];
 
         if ($user && $user->hasRole('ROLE_STUDENT')
-            && 'true' === $settingsManager->getSetting('allow_terms_conditions')
-            && 'course' === $settingsManager->getSetting('load_term_conditions_section')
+            && 'true' === $settingsManager->getSetting('registration.allow_terms_conditions')
+            && 'course' === $settingsManager->getSetting('platform.load_term_conditions_section')
         ) {
             $termAndConditionStatus = false;
             $extraValue = $extraFieldValuesRepository->findLegalAcceptByItemId($user->getId());

src/CoreBundle/Resources/views/Layout/vue_js_setup.html.twig

@@ -1,7 +1,7 @@
 <script>
-window.user = {{ user_json | raw }};
-window.access_url_id = {{ access_url_id }};
-window.languages = {{ languages_json | raw }};
+window.user = {{ user_json is defined ? user_json | raw : '{}' }};
+window.access_url_id = {{ access_url_id | default(1) }};
+window.languages = {{ languages_json is defined ? languages_json | raw : '{}' }};
 {% if legacy_breadcrumb is defined %}
 window.breadcrumb = {{ legacy_breadcrumb | raw }};
 {% else %}

src/CourseBundle/Entity/CStudentPublication.php

@@ -70,7 +70,7 @@
 )]
 #[ApiFilter(filterClass: CidFilter::class)]
 #[ApiFilter(filterClass: SidFilter::class)]
-class CStudentPublication extends AbstractResource implements ResourceInterface, ResourceShowCourseResourcesInSessionInterface, Stringable
+class CStudentPublication extends AbstractResource implements ResourceInterface, Stringable
 {
     #[Groups(['c_student_publication:write'])]
     public bool $addToGradebook = false;