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

pull/5737/head
christianbeeznst 1 year ago
parent d882386228
commit 2b5fac0ee6
  1. 1
      assets/vue/components/assignments/TeacherAssignmentList.vue
  2. 3
      public/main/course_description/course_description_controller.php
  3. 11
      public/main/forum/index.php
  4. 2
      public/main/template/default/course_description/index.html.twig
  5. 4
      src/CoreBundle/Controller/CourseController.php
  6. 6
      src/CoreBundle/Resources/views/Layout/vue_js_setup.html.twig
  7. 2
      src/CourseBundle/Entity/CStudentPublication.php

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

@ -85,6 +85,7 @@ class CourseDescriptionController
'resourceNode' => $description->getResourceNode(), 'resourceNode' => $description->getResourceNode(),
'sessionId' => $description->getFirstResourceLink()->getSession() ? $description->getFirstResourceLink()->getSession()->getId() : null, '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; $data['descriptions'][] = $description_data;
} }
@ -109,6 +110,8 @@ class CourseDescriptionController
$actions = self::getToolbar(); $actions = self::getToolbar();
$tpl = new Template(get_lang('Description')); $tpl = new Template(get_lang('Description'));
$tpl->assign('listing', $data); $tpl->assign('listing', $data);
$tpl->assign('is_allowed_to_edit', $is_allowed_to_edit); $tpl->assign('is_allowed_to_edit', $is_allowed_to_edit);

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

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

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

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

@ -70,7 +70,7 @@ use Symfony\Component\Validator\Constraints as Assert;
)] )]
#[ApiFilter(filterClass: CidFilter::class)] #[ApiFilter(filterClass: CidFilter::class)]
#[ApiFilter(filterClass: SidFilter::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'])] #[Groups(['c_student_publication:write'])]
public bool $addToGradebook = false; public bool $addToGradebook = false;

Loading…
Cancel
Save