Fix some little bugs in component implementation
This commit is contained in:
parent
df6ece2889
commit
7edb7a9760
3 changed files with 6 additions and 5 deletions
|
@ -101,6 +101,7 @@ parseLocalActivityURI' luAct = do
|
||||||
parseOutboxItemRoute (RepoOutboxItemR r i) = Just (LocalActorRepo r, i)
|
parseOutboxItemRoute (RepoOutboxItemR r i) = Just (LocalActorRepo r, i)
|
||||||
parseOutboxItemRoute (DeckOutboxItemR d i) = Just (LocalActorDeck d, i)
|
parseOutboxItemRoute (DeckOutboxItemR d i) = Just (LocalActorDeck d, i)
|
||||||
parseOutboxItemRoute (LoomOutboxItemR l i) = Just (LocalActorLoom l, i)
|
parseOutboxItemRoute (LoomOutboxItemR l i) = Just (LocalActorLoom l, i)
|
||||||
|
parseOutboxItemRoute (ProjectOutboxItemR r i) = Just (LocalActorProject r, i)
|
||||||
parseOutboxItemRoute _ = Nothing
|
parseOutboxItemRoute _ = Nothing
|
||||||
|
|
||||||
-- | If the given URI is remote, return as is. If the URI is local, verify that
|
-- | If the given URI is remote, return as is. If the URI is local, verify that
|
||||||
|
|
|
@ -538,11 +538,11 @@ getDeckProjectsR deckHash = do
|
||||||
deck <- get404 deckID
|
deck <- get404 deckID
|
||||||
actor <- getJust $ deckActor deck
|
actor <- getJust $ deckActor deck
|
||||||
stems <-
|
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.==. gestr E.?. StemComponentGestureRemoteStem
|
||||||
E.on $ E.just (stem E.^. StemId) E.==. gestl E.?. StemComponentGestureLocalStem
|
E.on $ E.just (stem E.^. StemId) E.==. gestl E.?. StemComponentGestureLocalStem
|
||||||
E.on $ E.just (accept E.^. StemComponentAcceptId) E.==. deleg E.?. StemDelegateLocalStem
|
E.on $ accept E.?. StemComponentAcceptId E.==. deleg E.?. StemDelegateLocalStem
|
||||||
E.on $ stem E.^. StemId E.==. accept E.^. StemComponentAcceptStem
|
E.on $ E.just (stem E.^. StemId) E.==. accept E.?. StemComponentAcceptStem
|
||||||
E.on $ ident E.^. StemIdentDeckStem E.==. stem E.^. StemId
|
E.on $ ident E.^. StemIdentDeckStem E.==. stem E.^. StemId
|
||||||
E.where_ $ ident E.^. StemIdentDeckDeck E.==. E.val deckID
|
E.where_ $ ident E.^. StemIdentDeckDeck E.==. E.val deckID
|
||||||
return (stem, deleg, gestl, gestr)
|
return (stem, deleg, gestl, gestr)
|
||||||
|
@ -624,7 +624,7 @@ postDeckApproveCompR deckHash stemHash = do
|
||||||
Left e -> do
|
Left e -> do
|
||||||
setMessage $ toHtml e
|
setMessage $ toHtml e
|
||||||
Right removeID -> do
|
Right removeID -> do
|
||||||
setMessage "Remove sent"
|
setMessage "Accept sent"
|
||||||
redirect $ DeckProjectsR deckHash
|
redirect $ DeckProjectsR deckHash
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
|
||||||
|
|
||||||
^{deckNavW (Entity deckID deck) actor}
|
^{deckNavW (Entity deckID deck) actor}
|
||||||
|
|
||||||
<h2>Collaborators
|
<h2>Projects
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
Loading…
Reference in a new issue