From 555c4aebebbd050ec00ad0b4369c196502301d7a Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 7 Jan 2020 18:37:10 +0100 Subject: [PATCH] feat(hide-columns): add more hider labels --- messages/uniworx/de-de-formal.msg | 2 -- messages/uniworx/en-eu.msg | 2 -- src/Handler/Course/Show.hs | 2 +- src/Handler/Tutorial/List.hs | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg index bd534ed7e..13d8acbbc 100644 --- a/messages/uniworx/de-de-formal.msg +++ b/messages/uniworx/de-de-formal.msg @@ -1435,8 +1435,6 @@ TutorialRoomPlaceholder: Raum TutorialTutors: Tutoren TutorialTutorAlreadyAdded: Ein Tutor mit dieser E-Mail ist bereits für dieses Tutorium eingetragen -TutorialActionsHead: Aktionen - OccurrenceNoneScheduled: (Noch) keine planmäßigen Termine OccurrenceNoneExceptions: (Noch) keine Termin-Ausnahmen diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg index dd20a08ff..b49b918f8 100644 --- a/messages/uniworx/en-eu.msg +++ b/messages/uniworx/en-eu.msg @@ -1433,8 +1433,6 @@ TutorialRoomPlaceholder: Room TutorialTutors: Tutors TutorialTutorAlreadyAdded: An user with this email address is already registered as tutor -TutorialActionsHead: Actions - OccurrenceNoneScheduled: No regular occurrences (yet) OccurrenceNoneExceptions: No exceptions (yet) diff --git a/src/Handler/Course/Show.hs b/src/Handler/Course/Show.hs index fa0951c5f..278df79e8 100644 --- a/src/Handler/Course/Show.hs +++ b/src/Handler/Course/Show.hs @@ -153,7 +153,7 @@ getCShowR tid ssh csh = do E.where_ $ participant E.^. TutorialParticipantTutorial E.==. E.val tutid in return $ E.val tutorialCapacity' E.-. numParticipants return . toWidget $ tshow freeCapacity - , sortable Nothing (mempty & cellAttrs <>~ pure ("uw-hide-columns--hider-label", mr MsgTutorialActionsHead)) $ \DBRow{ dbrOutput = Entity tutId Tutorial{..} } -> sqlCell $ do + , sortable Nothing (mempty & cellAttrs <>~ pure ("uw-hide-columns--hider-label", mr MsgActionsHead)) $ \DBRow{ dbrOutput = Entity tutId Tutorial{..} } -> sqlCell $ do mayRegister <- (== Authorized) <$> evalAccessDB (CTutorialR tid ssh csh tutorialName TRegisterR) True isRegistered <- case mbAid of Nothing -> return False diff --git a/src/Handler/Tutorial/List.hs b/src/Handler/Tutorial/List.hs index dc936bd63..67094db9f 100644 --- a/src/Handler/Tutorial/List.hs +++ b/src/Handler/Tutorial/List.hs @@ -52,7 +52,7 @@ getCTutorialListR tid ssh csh = do , sortable (Just "register-from") (i18nCell MsgTutorialRegisterFrom) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybeDateTimeCell tutorialRegisterFrom , sortable (Just "register-to") (i18nCell MsgTutorialRegisterTo) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybeDateTimeCell tutorialRegisterTo , sortable (Just "deregister-until") (i18nCell MsgTutorialDeregisterUntil) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybeDateTimeCell tutorialDeregisterUntil - , sortable Nothing (mempty & cellAttrs <>~ pure ("uw-hide-columns--hider-label", mr MsgTutorialActionsHead)) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> cell $ do + , sortable Nothing (mempty & cellAttrs <>~ pure ("uw-hide-columns--hider-label", mr MsgActionsHead)) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> cell $ do linkButton mempty [whamlet|_{MsgTutorialEdit}|] [BCIsButton] . SomeRoute $ CTutorialR tid ssh csh tutorialName TEditR linkButton mempty [whamlet|_{MsgTutorialDelete}|] [BCIsButton, BCDanger] . SomeRoute $ CTutorialR tid ssh csh tutorialName TDeleteR ]