forge/Vervis
1
0
Fork 0
Code Pull requests Activity

getTicketsR: Deduce ticket URLs correctly for JSON output

Browse source
This commit is contained in:
fr33domlover 2020-02-23 13:22:32 +00:00
parent a00c45a444
commit f6903364f4
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Vervis/Handler/Ticket.hs
View file

@ -181,7 +181,19 @@ getTicketsR shr prj = selectRep $ do
, OffsetBy off , OffsetBy off
, LimitTo lim , LimitTo lim
] ]
selectKeysList [LocalTicketTicket <-. tids] [Desc LocalTicketTicket] E.select $ E.from $ \ (lt `E.LeftOuterJoin` (tal `E.InnerJoin` p `E.InnerJoin` s `E.LeftOuterJoin` tup)) -> do
E.on $ tal E.?. TicketAuthorLocalId E.==. tup E.?. TicketUnderProjectAuthor
E.on $ p E.?. PersonIdent E.==. s E.?. SharerId
E.on $ tal E.?. TicketAuthorLocalAuthor E.==. p E.?. PersonId
E.on $ E.just (lt E.^. LocalTicketId) E.==. tal E.?. TicketAuthorLocalTicket
E.where_ $ lt E.^. LocalTicketTicket `E.in_` E.valList tids
E.orderBy [E.desc $ lt E.^. LocalTicketTicket]
return
( lt E.^. LocalTicketId
, tal E.?. TicketAuthorLocalId
, s E.?. SharerIdent
, tup E.?. TicketUnderProjectId
)
getPageAndNavCount countAllTickets selectTickets getPageAndNavCount countAllTickets selectTickets
encodeRouteHome <- getEncodeRouteHome encodeRouteHome <- getEncodeRouteHome
@ -189,8 +201,8 @@ getTicketsR shr prj = selectRep $ do
encodeRoutePageLocal <- getEncodeRoutePageLocal encodeRoutePageLocal <- getEncodeRoutePageLocal
let pageUrl = encodeRoutePageLocal here let pageUrl = encodeRoutePageLocal here
host <- asksSite siteInstanceHost host <- asksSite siteInstanceHost
encodeTicketKey <- getEncodeKeyHashid encodeLT <- getEncodeKeyHashid
let ticketUrl = TicketR shr prj . encodeTicketKey encodeTAL <- getEncodeKeyHashid
return $ return $
case mpage of case mpage of
@ -223,11 +235,18 @@ getTicketsR shr prj = selectRep $ do
else Nothing else Nothing
, collectionPageStartIndex = Nothing , collectionPageStartIndex = Nothing
, collectionPageItems = , collectionPageItems =
map (encodeRouteHome . ticketUrl) tickets map (encodeRouteHome . ticketRoute encodeLT encodeTAL)
tickets
} }
where where
here = TicketsR shr prj here = TicketsR shr prj
encodeStrict = BL.toStrict . encode encodeStrict = BL.toStrict . encode
ticketRoute encodeLT encodeTAL (E.Value ltid, E.Value mtalid, E.Value mshr, E.Value mtupid) =
case (mtalid, mshr, mtupid) of
(Nothing, Nothing, Nothing) -> TicketR shr prj $ encodeLT ltid
(Just talid, Just shrA, Nothing) -> SharerTicketR shrA $ encodeTAL talid
(Just _, Just _, Just _) -> TicketR shr prj $ encodeLT ltid
_ -> error "Impossible"
getTicketTreeR :: ShrIdent -> PrjIdent -> Handler Html getTicketTreeR :: ShrIdent -> PrjIdent -> Handler Html
getTicketTreeR shr prj = do getTicketTreeR shr prj = do