fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(course-news): prevent display of edit-functions unless auth'ed

Browse Source
This commit is contained in:
Gregor Kleen 2019-10-01 22:15:13 +02:00
parent a1ae47844e
commit 89cc9ad35e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Handler/Course/Show.hs
View File

@ -85,7 +85,9 @@ getCShowR tid ssh csh = do
& over (mapped . _1) E.unValue & over (mapped . _1) E.unValue
& over (mapped . _2) E.unValue & over (mapped . _2) E.unValue
lastEditText <- formatTime SelFormatDateTime $ maybe id max (guardOn visible =<< courseNewsVisibleFrom) courseNewsLastEdit lastEditText <- formatTime SelFormatDateTime $ maybe id max (guardOn visible =<< courseNewsVisibleFrom) courseNewsLastEdit
return (cID, n, visible, files, lastEditText) mayEdit <- hasWriteAccessTo $ CNewsR tid ssh csh cID CNEditR
mayDelete <- hasWriteAccessTo $ CNewsR tid ssh csh cID CNDeleteR
return (cID, n, visible, files, lastEditText, mayEdit, mayDelete)
return (cid,course,schoolName,participants,registration,lecturers,assistants,correctors,tutors,mAllocation,hasApplicationTemplate,mApplication,news) return (cid,course,schoolName,participants,registration,lecturers,assistants,correctors,tutors,mAllocation,hasApplicationTemplate,mApplication,news)
mDereg <- traverse (formatTime SelFormatDateTime) $ courseDeregisterUntil course mDereg <- traverse (formatTime SelFormatDateTime) $ courseDeregisterUntil course

15
templates/course.hamlet
View File

@ -8,7 +8,7 @@ $newline never
<dd .deflist__dd> <dd .deflist__dd>
$if not (null news) $if not (null news)
<ul .course-news .list--iconless> <ul .course-news .list--iconless>
$forall (cID, CourseNews{courseNewsTitle, courseNewsSummary, courseNewsContent}, isVisible, files, lastEditText) <- news $forall (cID, CourseNews{courseNewsTitle, courseNewsSummary, courseNewsContent}, isVisible, files, lastEditText, mayEdit, mayDelete) <- news
<li .course-news-item ##{"news-" <> toPathPiece cID}> <li .course-news-item ##{"news-" <> toPathPiece cID}>
$case (courseNewsTitle, courseNewsSummary) $case (courseNewsTitle, courseNewsSummary)
$# $of (Just title, Just summary) $# $of (Just title, Just summary)
@ -50,11 +50,14 @@ $# #{summary}
\ _{MsgCourseNewsFiles} \ _{MsgCourseNewsFiles}
<p .course-news-item__last-edit> <p .course-news-item__last-edit>
_{MsgCourseNewsLastEdited lastEditText} _{MsgCourseNewsLastEdited lastEditText}
<ul .course-news-item__actions .list--inline .list--comma-separated> $if mayEdit || mayDelete
<li> <ul .course-news-item__actions .list--inline .list--comma-separated>
^{modal (i18n MsgCourseNewsActionEdit) (Left (SomeRoute (CNewsR tid ssh csh cID CNEditR)))} $if mayEdit
<li> <li>
^{modal (i18n MsgCourseNewsActionDelete) (Left (SomeRoute (CNewsR tid ssh csh cID CNDeleteR)))} ^{modal (i18n MsgCourseNewsActionEdit) (Left (SomeRoute (CNewsR tid ssh csh cID CNEditR)))}
$if mayDelete
<li>
^{modal (i18n MsgCourseNewsActionDelete) (Left (SomeRoute (CNewsR tid ssh csh cID CNDeleteR)))}
$if mayCreateNews $if mayCreateNews
<div .div-p> <div .div-p>
^{modal (i18n MsgCourseNewsActionCreate) (Left (SomeRoute (CourseR tid ssh csh CNewsNewR)))} ^{modal (i18n MsgCourseNewsActionCreate) (Left (SomeRoute (CourseR tid ssh csh CNewsNewR)))}