From 2aea61c259fe22763076440589ef7b857f169cec Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 2 Jul 2019 14:52:31 +0200 Subject: [PATCH 1/2] chore(nixos): Fix development environment --- shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shell.nix b/shell.nix index 94ef0ba00..b942f99b9 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,7 @@ { nixpkgs ? import }: let + inherit (nixpkgs {}) pkgs; haskellPackages = import ./stackage.nix { inherit nixpkgs; }; drv = haskellPackages.callPackage ./uniworx.nix {}; From 92f5d84431cbf2647ccd38e45fdcc64a708bdaa0 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 2 Jul 2019 14:56:14 +0200 Subject: [PATCH 2/2] chore(haddock): Fix haddock --- src/Handler/Corrections.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 851c1b1c4..43a8bbed7 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -1218,8 +1218,8 @@ assignHandler tid ssh csh cid assignSids = do getCorrector (Just uid) | Just (User{..},loadMap) <- Map.lookup uid correctorMap = (nameEmailWidget userEmail userDisplayName userSurname, loadMap) - -- | Just (User{..} ) <- Map.lookup uid lecturerNames - -- = (nameEmailWidget userEmail userDisplayName userSurname, mempty) -- lecturers may also correct in rare cases + -- | Just (User{..} ) <- Map.lookup uid lecturerNames + -- = (nameEmailWidget userEmail userDisplayName userSurname, mempty) -- lecturers may also correct in rare cases getCorrector _ = ([whamlet|_{MsgNoCorrectorAssigned}|], mempty) -- avoid nestes hamlet $maybe with duplicated $nothing getCorrSheetStatus :: Maybe UserId -> SheetName -> Maybe CorrectionInfo