From 2b5fac0ee6a35bbe0b2edc16f0d00281874f19aa Mon Sep 17 00:00:00 2001
From: christianbeeznst <christian.fasanando@beeznest.com>
Date: Tue, 20 Aug 2024 00:05:45 -0500
Subject: [PATCH] Internal: Fix session visibility and assignment import issues
 - refs BT#21604

---
 .../components/assignments/TeacherAssignmentList.vue  |  1 -
 .../course_description_controller.php                 |  3 +++
 public/main/forum/index.php                           | 11 +++++------
 .../default/course_description/index.html.twig        |  2 +-
 src/CoreBundle/Controller/CourseController.php        |  4 ++--
 .../Resources/views/Layout/vue_js_setup.html.twig     |  6 +++---
 src/CourseBundle/Entity/CStudentPublication.php       |  2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/assets/vue/components/assignments/TeacherAssignmentList.vue b/assets/vue/components/assignments/TeacherAssignmentList.vue
index 9e6d9a63c9a..c343fd983b6 100644
--- a/assets/vue/components/assignments/TeacherAssignmentList.vue
+++ b/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>
diff --git a/public/main/course_description/course_description_controller.php b/public/main/course_description/course_description_controller.php
index 46edef6f4d0..4e2469f882a 100644
--- a/public/main/course_description/course_description_controller.php
+++ b/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);
diff --git a/public/main/forum/index.php b/public/main/forum/index.php
index 5c286f857a8..504b534b542 100644
--- a/public/main/forum/index.php
+++ b/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;
diff --git a/public/main/template/default/course_description/index.html.twig b/public/main/template/default/course_description/index.html.twig
index 07a8cd4cb34..1a946944537 100644
--- a/public/main/template/default/course_description/index.html.twig
+++ b/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 %}
diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php
index fa44cf0a73f..a374d7e5ae0 100644
--- a/src/CoreBundle/Controller/CourseController.php
+++ b/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());
diff --git a/src/CoreBundle/Resources/views/Layout/vue_js_setup.html.twig b/src/CoreBundle/Resources/views/Layout/vue_js_setup.html.twig
index b9e60acb1c0..258695240fc 100644
--- a/src/CoreBundle/Resources/views/Layout/vue_js_setup.html.twig
+++ b/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 %}
diff --git a/src/CourseBundle/Entity/CStudentPublication.php b/src/CourseBundle/Entity/CStudentPublication.php
index 95e04a4e5a6..ea017c8af72 100644
--- a/src/CourseBundle/Entity/CStudentPublication.php
+++ b/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;