diff --git a/src/Application.hs b/src/Application.hs index 9d5e8ebce..29eb69e05 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -713,8 +713,3 @@ addPWEntry User{ userAuthentication = _, ..} (Text.encodeUtf8 -> pw) = db' $ do - - - - - diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs index a09ea741a..226fbd28d 100644 --- a/src/Handler/Material.hs +++ b/src/Handler/Material.hs @@ -146,9 +146,7 @@ getMaterialListR tid ssh csh = do , (singletonMap "searchTypeAndDescription". FilterColumn $ \material criterion -> case getLast (criterion :: Last Text) of Nothing -> E.val True :: E.SqlExpr (E.Value Bool) Just needle -> (E.castString (material E.^. MaterialType) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%)) - --E.||. (E.castString (material E.^. MaterialDescription) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%)) - ) - + E.||. (E.castString (material E.^. MaterialDescription) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))) ] , dbtFilterUI = \mPrev -> mconcat $ catMaybes [ Just $ prismAForm (singletonFilter "searchName") mPrev $ aopt textField (fslI MsgFilterMaterialNameSearch) @@ -400,4 +398,3 @@ getMArchiveR tid ssh csh mnm = do let getMatQuery = materialArchiveSource tid ssh csh mnm serveSomeFiles archiveName getMatQuery -