Merge branch 'u2w-merge' into 'master'

u2w-merge

See merge request FraDrive/fradrive!11

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)

routes

@@ -282,4 +282,4 @@
 /swagger       SwaggerR              GET      !free
 /swagger.json  SwaggerJsonR          GET      !free
 
-!/*WellKnownFileName WellKnownR GET !free
+!/*WellKnownFileName WellKnownR GET !free

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)

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

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

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

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)
 

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
+type QualificationShorthand  = CI Text

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 --
 ------------