forge/Vervis
1
0
Fork 0
Code Pull requests Activity

Fix some little bugs in component implementation

Browse source
This commit is contained in:
Pere Lev 2023-11-02 23:14:29 +02:00
parent df6ece2889
commit 7edb7a9760
No known key found for this signature in database
GPG key ID: 5252C5C863E5E57D
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Vervis/Data/Actor.hs
View file

@ -101,6 +101,7 @@ parseLocalActivityURI' luAct = do
parseOutboxItemRoute (RepoOutboxItemR r i) = Just (LocalActorRepo r, i)
parseOutboxItemRoute (DeckOutboxItemR d i) = Just (LocalActorDeck d, i)
parseOutboxItemRoute (LoomOutboxItemR l i) = Just (LocalActorLoom l, i)
parseOutboxItemRoute (ProjectOutboxItemR r i) = Just (LocalActorProject r, i)
parseOutboxItemRoute _ = Nothing
-- | If the given URI is remote, return as is. If the URI is local, verify that

8
src/Vervis/Handler/Deck.hs
View file

@ -538,11 +538,11 @@ getDeckProjectsR deckHash = do
deck <- get404 deckID
actor <- getJust $ deckActor deck
stems <-
E.select $ E.from $ \ (ident `E.InnerJoin` stem `E.InnerJoin` accept `E.LeftOuterJoin` deleg `E.LeftOuterJoin` gestl `E.LeftOuterJoin` gestr) -> do
E.select $ E.from $ \ (ident `E.InnerJoin` stem `E.LeftOuterJoin` accept `E.LeftOuterJoin` deleg `E.LeftOuterJoin` gestl `E.LeftOuterJoin` gestr) -> do
E.on $ E.just (stem E.^. StemId) E.==. gestr E.?. StemComponentGestureRemoteStem
E.on $ E.just (stem E.^. StemId) E.==. gestl E.?. StemComponentGestureLocalStem
E.on $ E.just (accept E.^. StemComponentAcceptId) E.==. deleg E.?. StemDelegateLocalStem
E.on $ stem E.^. StemId E.==. accept E.^. StemComponentAcceptStem
E.on $ accept E.?. StemComponentAcceptId E.==. deleg E.?. StemDelegateLocalStem
E.on $ E.just (stem E.^. StemId) E.==. accept E.?. StemComponentAcceptStem
E.on $ ident E.^. StemIdentDeckStem E.==. stem E.^. StemId
E.where_ $ ident E.^. StemIdentDeckDeck E.==. E.val deckID
return (stem, deleg, gestl, gestr)
@ -624,7 +624,7 @@ postDeckApproveCompR deckHash stemHash = do
Left e -> do
setMessage $ toHtml e
Right removeID -> do
setMessage "Remove sent"
setMessage "Accept sent"
redirect $ DeckProjectsR deckHash

2
templates/deck/projects.hamlet
View file

@ -14,7 +14,7 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
^{deckNavW (Entity deckID deck) actor}
<h2>Collaborators
<h2>Projects
<table>
<tr>