From 3b6e700531205b8b8a3e9b319c4f7a9c6868bc95 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 22 Jul 2019 15:15:12 +0200 Subject: [PATCH] feat(course-teaser): reintroduced courseId and course-teaser.julius --- src/Handler/Utils/Table/Pagination.hs | 3 ++- templates/table/course/course-teaser.hamlet | 2 +- .../course/{course-teaser_old.julius => course-teaser.julius} | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename templates/table/course/{course-teaser_old.julius => course-teaser.julius} (91%) diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs index 6c59c36ca..ba7c29687 100644 --- a/src/Handler/Utils/Table/Pagination.hs +++ b/src/Handler/Utils/Table/Pagination.hs @@ -851,12 +851,13 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db columnCount :: Int64 columnCount = olength64 $ getColonnade dbtColonnade - wRows <- forM rows $ \row' -> let + wRows <- forM (zip [0..length rows] rows) $ \(cid, row') -> let Course{..} = row' ^. c . _entityVal lecturers = toListOf l row' courseLecturers = intercalate ", " $ userSurname . entityVal <$> lecturers isRegistered = row' ^. r courseSchoolName = unSchoolKey courseSchool + courseId = tshow cid in return $(widgetFile "table/course/course-teaser") return $(widgetFile "table/course/colonnade") diff --git a/templates/table/course/course-teaser.hamlet b/templates/table/course/course-teaser.hamlet index c8f648542..08ec2cf29 100644 --- a/templates/table/course/course-teaser.hamlet +++ b/templates/table/course/course-teaser.hamlet @@ -1,4 +1,4 @@ -
+
_{courseShorthand}
diff --git a/templates/table/course/course-teaser_old.julius b/templates/table/course/course-teaser.julius similarity index 91% rename from templates/table/course/course-teaser_old.julius rename to templates/table/course/course-teaser.julius index c86caa94c..2c31b6aed 100644 --- a/templates/table/course/course-teaser_old.julius +++ b/templates/table/course/course-teaser.julius @@ -3,7 +3,7 @@ var COURSE_TEASER_CHEVRON_CLASS = 'course-chevron'; document.addEventListener('DOMContentLoaded', function() { var courseTeaserId = #{String courseId}; - var courseTeaser = document.querySelector('#course-' + courseTeaserId); + var courseTeaser = document.querySelector('#courseteaser-' + courseTeaserId); courseTeaser.addEventListener('click', function(event) { var isLink = event.target.tagName.toLowerCase() === 'a';