diff --git a/src/Vervis/Handler/Ticket.hs b/src/Vervis/Handler/Ticket.hs index 10a6367..0039bef 100644 --- a/src/Vervis/Handler/Ticket.hs +++ b/src/Vervis/Handler/Ticket.hs @@ -56,10 +56,12 @@ import Vervis.Settings (widgetFile) getTicketsR :: Text -> Text -> Handler Html getTicketsR shar proj = do - rows <- runDB $ select $ from $ \ (ticket, person, sharer) -> do + rows <- runDB $ select $ from $ \ (sharer, project, ticket) -> do where_ $ - ticket ^. TicketCreator E.==. person ^. PersonId &&. - person ^. PersonIdent E.==. sharer ^. SharerId + sharer ^. SharerIdent E.==. val shar &&. + project ^. ProjectSharer E.==. sharer ^. SharerId &&. + project ^. ProjectIdent E.==. val proj &&. + ticket ^. TicketProject E.==. project ^. ProjectId orderBy [asc $ ticket ^. TicketNumber] return ( ticket ^. TicketNumber @@ -68,9 +70,7 @@ getTicketsR shar proj = do , ticket ^. TicketTitle , ticket ^. TicketDone ) - defaultLayout $ do - setTitle $ toHtml $ T.intercalate " :: " [shar, proj, "Tickes"] - $(widgetFile "ticket/list") + defaultLayout $(widgetFile "ticket/list") postTicketsR :: Text -> Text -> Handler Html postTicketsR shar proj = do