Skip to content

Commit

Permalink
Fix teacher view not showing in navbar in some cases
Browse files Browse the repository at this point in the history
  • Loading branch information
Veikkosuhonen committed Aug 28, 2023
1 parent 32acb51 commit 53c0062
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
3 changes: 0 additions & 3 deletions src/client/pages/CourseSummary/SummaryV2/SummaryRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ import React from 'react'
import { useTranslation } from 'react-i18next'
import { ChevronRight } from '@mui/icons-material'
import { Link as RouterLink } from 'react-router-dom'
import { grey } from '@mui/material/colors'
import _ from 'lodash'
import { useSummaries } from './api'
import { getLanguageValue } from '../../../util/languageUtils'
import SummaryResultItem from '../../../components/SummaryResultItem/SummaryResultItem'
import { LoadingProgress } from '../../../components/common/LoadingProgress'
import { CourseUnitLabel, OrganisationLabel } from '../Labels'
import PercentageCell from '../PercentageCell'
import { colors } from '../../../util/common'
import { generate } from '../../../util/randomColor'
import useRandomColor from '../../../hooks/useRandomColor'

const { Box, ButtonBase, Typography } = require('@mui/material')
Expand Down
4 changes: 1 addition & 3 deletions src/server/routes/courseSummary/courseSummaryController.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ const getAccessibleCourseRealisationIds = async user => {
WHERE user_feedback_targets.user_id = :userId
AND is_teacher(user_feedback_targets.access_status)
AND feedback_targets.feedback_type = 'courseRealisation'
AND course_realisations.start_date < NOW()
AND course_realisations.start_date > NOW() - interval '16 months';
AND course_realisations.start_date > NOW() - interval '24 months';
`,
{
replacements: {
Expand Down Expand Up @@ -54,7 +53,6 @@ const getAccessInfo = async (req, res) => {
const { organisationAccess } = user
const accesses = Object.entries(organisationAccess)
const accessibleCourseRealisationIds = await getAccessibleCourseRealisationIds(user)

const hasReadOnSomeOrganisation = accesses.some(([, access]) => access.read)
const isAdminOfSomeOrganisation = accesses.some(([, access]) => access.admin)

Expand Down

0 comments on commit 53c0062

Please sign in to comment.