diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ab98e1a6..35e55b013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -156,6 +156,7 @@ All notable changes to this project will be documented in this file. See [standa ### Bug Fixes + * **system-message:** add volatile cluster setting model default ([6655582](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6655582ace098808bfcea90ca85fce2fe0024d2b)) ## [25.29.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v25.29.1...v25.29.2) (2022-04-21) diff --git a/routes b/routes index 9c7b89ae8..98a440272 100644 --- a/routes +++ b/routes @@ -282,4 +282,4 @@ /swagger SwaggerR GET !free /swagger.json SwaggerJsonR GET !free -!/*WellKnownFileName WellKnownR GET !free \ No newline at end of file +!/*WellKnownFileName WellKnownR GET !free diff --git a/src/Application.hs b/src/Application.hs index 0eabab1f9..d3df9d441 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -156,7 +156,6 @@ import Handler.ApiDocs import Handler.Swagger import ServantApi () -- YesodSubDispatch instances - import Servant.API import Servant.Client import Network.HTTP.Client.TLS (mkManagerSettings) diff --git a/src/Foundation/I18n.hs b/src/Foundation/I18n.hs index 47d2fd6fb..ab0f2d0f3 100644 --- a/src/Foundation/I18n.hs +++ b/src/Foundation/I18n.hs @@ -142,6 +142,11 @@ ordinalEN (toMessage -> numStr) = case lastChar of where lastChar = last <$> fromNullable numStr +notDE :: Bool -> Text +notDE = bool "nicht" "" + +notEN :: Bool -> Text +notEN = bool "not" "" {- -- TODO: use this is message eventually -- Commonly used plurals @@ -163,12 +168,6 @@ thingEN num t = tshow num <> Text.cons ' ' (thing t) thing Examinee = pluralENs num "examinee" -} -notDE :: Bool -> Text -notDE = bool "nicht" "" - -notEN :: Bool -> Text -notEN = bool "not" "" - -- | Convenience function for i18n messages definitions maybeToMessage :: ToMessage m => Text -> Maybe m -> Text -> Text maybeToMessage _ Nothing _ = mempty diff --git a/src/Handler/SystemMessage.hs b/src/Handler/SystemMessage.hs index 94e900e4f..e51dfc6aa 100644 --- a/src/Handler/SystemMessage.hs +++ b/src/Handler/SystemMessage.hs @@ -19,6 +19,7 @@ import qualified Data.Text as Text (intercalate) import qualified Database.Esqueleto.Legacy as E + invalidateVisibleSystemMessages :: (MonadHandler m, HandlerSite m ~ UniWorX) => m () invalidateVisibleSystemMessages = memcachedByInvalidate AuthCacheVisibleSystemMessages $ Proxy @(Map SystemMessageId (Maybe UTCTime, Maybe UTCTime)) @@ -49,7 +50,6 @@ systemMessageVolatileClusterSettingsForm (fmap Set.toList -> mPrev) = wFormToAFo miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/massinput/systemMessage/volatileClusterSettings/layout") fmap Set.fromList <$> massInputAccumEditW miAdd miEdit miButtonAction miLayout ("system-message-volatile-cluster-settings" :: Text) (fslI MsgSystemMessageOnVolatileClusterSettings) False mPrev - getMessageR, postMessageR :: CryptoUUIDSystemMessage -> Handler Html getMessageR = postMessageR postMessageR cID = do diff --git a/src/Jobs/Handler/Files.hs b/src/Jobs/Handler/Files.hs index 79b25593f..ae522be5b 100644 --- a/src/Jobs/Handler/Files.hs +++ b/src/Jobs/Handler/Files.hs @@ -106,7 +106,6 @@ dispatchJobDetectMissingFiles = JobHandlerAtomicDeferrableWithFinalizer act fin let useRefSource refKind refSource = transPipe (lift . withReaderT projectBackend) (refSource .| C.filterM (\ref -> not <$> exists [FileContentEntryHash ==. ref])) .| C.mapM_ (insertRef refKind) useRefSource (nameToPathPiece ''Job) jobFileReferences - let allMissingDb :: Set Minio.Object allMissingDb = setOf (folded . folded . re minioFileReference) missingDb filterMissingDb :: forall m. Monad m diff --git a/src/Model/Migration/Definitions.hs b/src/Model/Migration/Definitions.hs index bc779af34..7b1526437 100644 --- a/src/Model/Migration/Definitions.hs +++ b/src/Model/Migration/Definitions.hs @@ -101,9 +101,6 @@ data ManualMigration | Migration20210208StudyFeaturesRelevanceCachedUUIDs | Migration20210318CrontabSubmissionRatedNotification | Migration20210608SeparateTermActive - -- TODO: migration regarding authorship statements - -- - apply desired non-default modes for IfI - -- - set authorship statement texts for IfI deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable) deriving anyclass (Universe, Finite) diff --git a/src/Model/Types/Common.hs b/src/Model/Types/Common.hs index e8c1a13b1..faa946814 100644 --- a/src/Model/Types/Common.hs +++ b/src/Model/Types/Common.hs @@ -62,4 +62,4 @@ type TermCandidateIncidence = UUID type SessionFileReference = Digest SHA3_256 type QualificationName = CI Text -type QualificationShorthand = CI Text \ No newline at end of file +type QualificationShorthand = CI Text diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs index ff923d430..a26776c30 100644 --- a/src/Utils/Form.hs +++ b/src/Utils/Form.hs @@ -76,6 +76,7 @@ import qualified Data.Binary as Binary import qualified Data.ByteString.Base64.URL as Base64 (encodeUnpadded) import qualified Data.ByteString as BS + ------------ -- Fields -- ------------