TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1506 from eikek/remove-delete-btn

Browse Source 
Remove delete btn
This commit is contained in:
mergify[bot] 2022-04-09 18:50:03 +00:00 committed by GitHub
commit 81711a7546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/store/src/main/scala/docspell/store/records/RCollective.scala
View File

@ -97,11 +97,11 @@ object RCollective {
def getSettings(coll: Ident): ConnectionIO[Option[Settings]] =
(for {
sett <- OptionT(getRawSettings(coll))
prev <- OptionT.fromOption[ConnectionIO](sett.classifier)
prev <- OptionT.pure[ConnectionIO](sett.classifier)
cats <- OptionT.liftF(RTag.listCategories(coll))
next = prev.copy(categories = prev.categories.intersect(cats))
next = prev.map(p => p.copy(categories = p.categories.intersect(cats)))
pws <- OptionT.liftF(RCollectivePassword.findAll(coll))
} yield sett.copy(classifier = Some(next), passwords = pws.map(_.password))).value
} yield sett.copy(classifier = next, passwords = pws.map(_.password))).value
private def getRawSettings(coll: Ident): ConnectionIO[Option[Settings]] = {
import RClassifierSetting.stringListMeta

2
modules/webapp/src/main/elm/Comp/NotificationChannelManage.elm
View File

@ -302,7 +302,7 @@ viewForm texts settings outerModel model =
|> Maybe.map .id
newChannel =
channelId |> (==) (Just "")
channelId == Just "" || channelId == Nothing
headline =
case Comp.ChannelForm.channelType model of