From ef9a5dc5a9bd729e4a8c5a8af2193fead366726e Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 29 Nov 2023 16:22:09 +0100 Subject: [PATCH] chore(firm): disallow supervisors on firm routes for now --- routes | 6 +++--- src/Handler/Firm.hs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/routes b/routes index df8c32fa2..b024c577f 100644 --- a/routes +++ b/routes @@ -113,12 +113,12 @@ /for/#CryptoUUIDUser/user ForProfileR GET POST !supervisor !self /for/#CryptoUUIDUser/user/profile ForProfileDataR GET !supervisor !self -/firms FirmAllR GET POST !supervisor +/firms FirmAllR GET POST -- not yet !supervisor /firms/comm/+Companies FirmsCommR GET POST /firm/#CompanyShorthand/debug FirmR GET POST /firm/#CompanyShorthand/comm FirmCommR GET POST -/firm/#CompanyShorthand FirmUsersR GET POST !supervisor -/firm/#CompanyShorthand/supers FirmSupersR GET POST !supervisor +/firm/#CompanyShorthand FirmUsersR GET POST -- not yet !supervisor +/firm/#CompanyShorthand/supers FirmSupersR GET POST -- not yet !supervisor /exam-office ExamOfficeR !exam-office: / EOExamsR GET POST !system-exam-office diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs index 79236d154..6e88accfa 100644 --- a/src/Handler/Firm.hs +++ b/src/Handler/Firm.hs @@ -735,7 +735,7 @@ mkFirmUserTable isAdmin cid = do return (usr E.^. UserId, usr E.^. UserDisplayName) let -- supervisorField :: Field Handler UserId - supervisorField = selectField $ procOptions rawSupers + -- supervisorField = selectField $ procOptions rawSupers supervisorsField = multiSelectField $ procOptions rawSupers fsh = unCompanyKey cid @@ -825,7 +825,7 @@ mkFirmUserTable isAdmin cid = do -- superField = selectField $ ???? dbtFilterUI mPrev = mconcat [ fltrUserNameEmailHdrUI MsgTableCompanyUser mPrev - , prismAForm (singletonFilter "supervisor-is" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift supervisorField) (fslI MsgFilterSupervisor) + -- , prismAForm (singletonFilter "supervisor-is" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift supervisorField) (fslI MsgFilterSupervisor) , prismAForm (multiFilter "supervisors-are" . maybePrism monoPathPieces) mPrev $ aopt (hoistField lift supervisorsField) (fslI MsgFilterSupervisor) , prismAForm (singletonFilter "has-supervisor" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterSupervisor) , prismAForm (singletonFilter "has-company-supervisor" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI $ MsgFilterSupervisorCompany fsh)