diff --git a/config/routes b/config/routes
index 3465381..069af2a 100644
--- a/config/routes
+++ b/config/routes
@@ -153,34 +153,34 @@
/tdeps/#TicketDepKeyHashid TicketDepR GET
-/s/#ShrIdent/p/#PrjIdent/t TicketsR GET POST
-/s/#ShrIdent/p/#PrjIdent/t/!tree TicketTreeR GET
-/s/#ShrIdent/p/#PrjIdent/t/!new TicketNewR GET
+/s/#ShrIdent/p/#PrjIdent/t ProjectTicketsR GET POST
+/s/#ShrIdent/p/#PrjIdent/t/!tree ProjectTicketTreeR GET
+/s/#ShrIdent/p/#PrjIdent/t/!new ProjectTicketNewR GET
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid TicketR GET PUT DELETE POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/edit TicketEditR GET
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/accept TicketAcceptR POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/close TicketCloseR POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/open TicketOpenR POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/claim TicketClaimR POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/unclaim TicketUnclaimR POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/assign TicketAssignR GET POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/unassign TicketUnassignR POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/follow TicketFollowR POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/unfollow TicketUnfollowR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid ProjectTicketR GET PUT DELETE POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/edit ProjectTicketEditR GET
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/accept ProjectTicketAcceptR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/close ProjectTicketCloseR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/open ProjectTicketOpenR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/claim ProjectTicketClaimR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/unclaim ProjectTicketUnclaimR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/assign ProjectTicketAssignR GET POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/unassign ProjectTicketUnassignR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/follow ProjectTicketFollowR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/unfollow ProjectTicketUnfollowR POST
/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/cr ClaimRequestsTicketR GET POST
/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/cr/new ClaimRequestNewR GET
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/d TicketDiscussionR GET POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/d/!reply TicketTopReplyR GET
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/d/#MessageKeyHashid TicketMessageR POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/d/#MessageKeyHashid/reply TicketReplyR GET
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/deps TicketDepsR GET POST
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/deps/!new TicketDepNewR GET
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/d ProjectTicketDiscussionR GET POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/d/!reply ProjectTicketTopReplyR GET
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/d/#MessageKeyHashid ProjectTicketMessageR POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/d/#MessageKeyHashid/reply ProjectTicketReplyR GET
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/deps ProjectTicketDepsR GET POST
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/deps/!new ProjectTicketDepNewR GET
/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/deps/#LocalTicketKeyHashid TicketDepOldR POST DELETE
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/rdeps TicketReverseDepsR GET
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/participants TicketParticipantsR GET
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/team TicketTeamR GET
-/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/events TicketEventsR GET
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/rdeps ProjectTicketReverseDepsR GET
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/participants ProjectTicketParticipantsR GET
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/team ProjectTicketTeamR GET
+/s/#ShrIdent/p/#PrjIdent/t/#LocalTicketKeyHashid/events ProjectTicketEventsR GET
/s/#ShrIdent/t SharerTicketsR GET
diff --git a/src/Vervis/API.hs b/src/Vervis/API.hs
index aa26a05..64e2b77 100644
--- a/src/Vervis/API.hs
+++ b/src/Vervis/API.hs
@@ -289,7 +289,7 @@ createNoteC host (Note mluNote luAttrib aud muParent muContext mpublished source
Nothing -> throwE "Local context isn't a valid route"
Just r -> return r
case route of
- TicketR shr prj num -> return (shr, prj, num)
+ ProjectTicketR shr prj num -> return (shr, prj, num)
_ -> throwE "Local context isn't a ticket route"
atMostSharer :: e -> (ShrIdent, LocalSharerRelatedSet) -> ExceptT e Handler (Maybe ShrIdent)
@@ -780,11 +780,11 @@ followC shrUser summary audience follow@(AP.Follow uObject muContext hide) = run
lift $ forkWorker "Outbox POST handler: async HTTP delivery" $ deliverRemoteHttp dont obiidFollow doc remotesHttp
return obiidFollow
where
- parseFollowee (SharerR shr) = Just $ FolloweeSharer shr
- parseFollowee (ProjectR shr prj) = Just $ FolloweeProject shr prj
- parseFollowee (TicketR shr prj num) = Just $ FolloweeTicket shr prj num
- parseFollowee (RepoR shr rp) = Just $ FolloweeRepo shr rp
- parseFollowee _ = Nothing
+ parseFollowee (SharerR shr) = Just $ FolloweeSharer shr
+ parseFollowee (ProjectR shr prj) = Just $ FolloweeProject shr prj
+ parseFollowee (ProjectTicketR shr prj num) = Just $ FolloweeTicket shr prj num
+ parseFollowee (RepoR shr rp) = Just $ FolloweeRepo shr rp
+ parseFollowee _ = Nothing
followeeActor (FolloweeSharer shr) = LocalActorSharer shr
followeeActor (FolloweeProject shr prj) = LocalActorProject shr prj
@@ -1088,7 +1088,7 @@ offerTicketC shrUser summary audience offer@(Offer ticket uTarget) = runExceptT
./s/#{shr2text shrProject}/p/#{prj2text prjProject}
: #
-
+
#{preEscapedToHtml $ unTextHtml $ AP.ticketSummary ticket}.
|]
hLocal <- asksSite siteInstanceHost
@@ -1113,7 +1113,7 @@ offerTicketC shrUser summary audience offer@(Offer ticket uTarget) = runExceptT
{ acceptObject = ObjURI hLocal luOffer
, acceptResult =
Just $ encodeRouteLocal $
- TicketR shrProject prjProject ltkhid
+ ProjectTicketR shrProject prjProject ltkhid
}
}
update
diff --git a/src/Vervis/ActivityPub.hs b/src/Vervis/ActivityPub.hs
index cfe6502..ee71726 100644
--- a/src/Vervis/ActivityPub.hs
+++ b/src/Vervis/ActivityPub.hs
@@ -142,7 +142,7 @@ parseContext uContext = do
Nothing -> throwE "Local context isn't a valid route"
Just r -> return r
case route of
- TicketR shr prj num -> return (shr, prj, num)
+ ProjectTicketR shr prj num -> return (shr, prj, num)
_ -> throwE "Local context isn't a ticket route"
else return $ Right uContext
diff --git a/src/Vervis/ActivityPub/Recipient.hs b/src/Vervis/ActivityPub/Recipient.hs
index 08e44ff..5297879 100644
--- a/src/Vervis/ActivityPub/Recipient.hs
+++ b/src/Vervis/ActivityPub/Recipient.hs
@@ -113,9 +113,9 @@ parseLocalPersonCollection (ProjectTeamR shr prj) =
Just $ LocalPersonCollectionProjectTeam shr prj
parseLocalPersonCollection (ProjectFollowersR shr prj) =
Just $ LocalPersonCollectionProjectFollowers shr prj
-parseLocalPersonCollection (TicketTeamR shr prj num) =
+parseLocalPersonCollection (ProjectTicketTeamR shr prj num) =
Just $ LocalPersonCollectionTicketTeam shr prj num
-parseLocalPersonCollection (TicketParticipantsR shr prj num) =
+parseLocalPersonCollection (ProjectTicketParticipantsR shr prj num) =
Just $ LocalPersonCollectionTicketFollowers shr prj num
parseLocalPersonCollection (RepoTeamR shr rp) =
Just $ LocalPersonCollectionRepoTeam shr rp
@@ -127,8 +127,8 @@ renderLocalPersonCollection :: LocalPersonCollection -> Route App
renderLocalPersonCollection (LocalPersonCollectionSharerFollowers shr) = SharerFollowersR shr
renderLocalPersonCollection (LocalPersonCollectionProjectTeam shr prj) = ProjectTeamR shr prj
renderLocalPersonCollection (LocalPersonCollectionProjectFollowers shr prj) = ProjectFollowersR shr prj
-renderLocalPersonCollection (LocalPersonCollectionTicketTeam shr prj ltkhid) = TicketTeamR shr prj ltkhid
-renderLocalPersonCollection (LocalPersonCollectionTicketFollowers shr prj ltkhid) = TicketParticipantsR shr prj ltkhid
+renderLocalPersonCollection (LocalPersonCollectionTicketTeam shr prj ltkhid) = ProjectTicketTeamR shr prj ltkhid
+renderLocalPersonCollection (LocalPersonCollectionTicketFollowers shr prj ltkhid) = ProjectTicketParticipantsR shr prj ltkhid
renderLocalPersonCollection (LocalPersonCollectionRepoTeam shr rp) = RepoTeamR shr rp
renderLocalPersonCollection (LocalPersonCollectionRepoFollowers shr rp) = RepoFollowersR shr rp
diff --git a/src/Vervis/Client.hs b/src/Vervis/Client.hs
index 59db032..76e7c6d 100644
--- a/src/Vervis/Client.hs
+++ b/src/Vervis/Client.hs
@@ -196,7 +196,7 @@ followTicket
=> ShrIdent -> ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Bool -> m (TextHtml, Audience URIMode, AP.Follow URIMode)
followTicket shrAuthor shrObject prjObject numObject hide = do
encodeRouteHome <- getEncodeRouteHome
- let uObject = encodeRouteHome $ TicketR shrObject prjObject numObject
+ let uObject = encodeRouteHome $ ProjectTicketR shrObject prjObject numObject
uRecip = encodeRouteHome $ ProjectR shrObject prjObject
follow shrAuthor uObject uRecip hide
@@ -401,7 +401,7 @@ undoFollowTicket
undoFollowTicket shrAuthor pidAuthor shrFollowee prjFollowee numFollowee =
undoFollow shrAuthor pidAuthor getFsid "project" objRoute recipRoute
where
- objRoute = TicketR shrFollowee prjFollowee numFollowee
+ objRoute = ProjectTicketR shrFollowee prjFollowee numFollowee
recipRoute = ProjectR shrFollowee prjFollowee
getFsid = do
sid <- do
diff --git a/src/Vervis/Federation.hs b/src/Vervis/Federation.hs
index edab3c8..ac01aa5 100644
--- a/src/Vervis/Federation.hs
+++ b/src/Vervis/Federation.hs
@@ -118,7 +118,7 @@ parseTicket project luContext = do
Nothing -> throwE "Local context isn't a valid route"
Just r -> return r
case route of
- TicketR shr prj num ->
+ ProjectTicketR shr prj num ->
if (shr, prj) == project
then return num
else throwE "Local context ticket doesn't belong to the recipient project"
diff --git a/src/Vervis/Federation/Discussion.hs b/src/Vervis/Federation/Discussion.hs
index 30c98e8..c60cd97 100644
--- a/src/Vervis/Federation/Discussion.hs
+++ b/src/Vervis/Federation/Discussion.hs
@@ -231,10 +231,10 @@ projectCreateNoteF now shrRecip prjRecip author body (Note mluNote _ _ muParent
ProjectFollowersR shr prj
| shr == shrRecip && prj == prjRecip
-> Just CreateNoteRecipProjectFollowers
- TicketParticipantsR shr prj tkhid
+ ProjectTicketParticipantsR shr prj tkhid
| shr == shrRecip && prj == prjRecip && tkhid == ctx
-> Just CreateNoteRecipTicketParticipants
- TicketTeamR shr prj tkhid
+ ProjectTicketTeamR shr prj tkhid
| shr == shrRecip && prj == prjRecip && tkhid == ctx
-> Just CreateNoteRecipTicketTeam
_ -> Nothing
diff --git a/src/Vervis/Federation/Offer.hs b/src/Vervis/Federation/Offer.hs
index e936f8c..7da7285 100644
--- a/src/Vervis/Federation/Offer.hs
+++ b/src/Vervis/Federation/Offer.hs
@@ -406,7 +406,7 @@ projectFollowF shr prj =
where
objRoute (ProjectR shr' prj')
| shr == shr' && prj == prj' = Just Nothing
- objRoute (TicketR shr' prj' num)
+ objRoute (ProjectTicketR shr' prj' num)
| shr == shr' && prj == prj' = Just $ Just num
objRoute _ = Nothing
diff --git a/src/Vervis/Federation/Ticket.hs b/src/Vervis/Federation/Ticket.hs
index 16fe31a..b392824 100644
--- a/src/Vervis/Federation/Ticket.hs
+++ b/src/Vervis/Federation/Ticket.hs
@@ -335,7 +335,7 @@ projectOfferTicketF
./s/#{shr2text shrRecip}/p/#{prj2text prjRecip}
\: #
-
+
#{preEscapedToHtml $ unTextHtml $ AP.ticketSummary ticket}.
|]
hLocal <- asksSite siteInstanceHost
@@ -363,7 +363,7 @@ projectOfferTicketF
luOffer
, acceptResult =
Just $ encodeRouteLocal $
- TicketR shrRecip prjRecip ltkhid
+ ProjectTicketR shrRecip prjRecip ltkhid
}
}
update obiid [OutboxItemActivity =. persistJSONObjectFromDoc doc]
diff --git a/src/Vervis/Foundation.hs b/src/Vervis/Foundation.hs
index df8d428..29aff9c 100644
--- a/src/Vervis/Foundation.hs
+++ b/src/Vervis/Foundation.hs
@@ -352,27 +352,27 @@ instance Yesod App where
(WorkflowEnumCtorNewR shr _ _ , _ ) -> personOrGroupAdmin shr
(WorkflowEnumCtorR shr _ _ _ , _ ) -> personOrGroupAdmin shr
- (TicketsR s j , True) -> projOp ProjOpOpenTicket s j
- (TicketNewR s j , _ ) -> projOp ProjOpOpenTicket s j
- (TicketR user _ _ , True) -> person user
- (TicketEditR user _ _ , _ ) -> person user
- (TicketAcceptR s j _ , _ ) -> projOp ProjOpAcceptTicket s j
- (TicketCloseR s j _ , _ ) -> projOp ProjOpCloseTicket s j
- (TicketOpenR s j _ , _ ) -> projOp ProjOpReopenTicket s j
- (TicketClaimR s j _ , _ ) -> projOp ProjOpClaimTicket s j
- (TicketUnclaimR s j _ , _ ) -> projOp ProjOpUnclaimTicket s j
- (TicketAssignR s j _ , _ ) -> projOp ProjOpAssignTicket s j
- (TicketUnassignR s j _ , _ ) -> projOp ProjOpUnassignTicket s j
- (TicketFollowR _ _ _ , True) -> personAny
- (TicketUnfollowR _ _ _ , True) -> personAny
+ (ProjectTicketsR s j , True) -> projOp ProjOpOpenTicket s j
+ (ProjectTicketNewR s j , _ ) -> projOp ProjOpOpenTicket s j
+ (ProjectTicketR user _ _ , True) -> person user
+ (ProjectTicketEditR user _ _ , _ ) -> person user
+ (ProjectTicketAcceptR s j _ , _ ) -> projOp ProjOpAcceptTicket s j
+ (ProjectTicketCloseR s j _ , _ ) -> projOp ProjOpCloseTicket s j
+ (ProjectTicketOpenR s j _ , _ ) -> projOp ProjOpReopenTicket s j
+ (ProjectTicketClaimR s j _ , _ ) -> projOp ProjOpClaimTicket s j
+ (ProjectTicketUnclaimR s j _ , _ ) -> projOp ProjOpUnclaimTicket s j
+ (ProjectTicketAssignR s j _ , _ ) -> projOp ProjOpAssignTicket s j
+ (ProjectTicketUnassignR s j _ , _ ) -> projOp ProjOpUnassignTicket s j
+ (ProjectTicketFollowR _ _ _ , True) -> personAny
+ (ProjectTicketUnfollowR _ _ _ , True) -> personAny
(ClaimRequestsTicketR s j _, True) -> projOp ProjOpRequestTicket s j
(ClaimRequestNewR s j _ , _ ) -> projOp ProjOpRequestTicket s j
- (TicketDiscussionR _ _ _ , True) -> personAny
- (TicketMessageR _ _ _ _ , True) -> personAny
- (TicketTopReplyR _ _ _ , _ ) -> personAny
- (TicketReplyR _ _ _ _ , _ ) -> personAny
- (TicketDepsR s j _ , True) -> projOp ProjOpAddTicketDep s j
- (TicketDepNewR s j _ , _ ) -> projOp ProjOpAddTicketDep s j
+ (ProjectTicketDiscussionR _ _ _ , True) -> personAny
+ (ProjectTicketMessageR _ _ _ _ , True) -> personAny
+ (ProjectTicketTopReplyR _ _ _ , _ ) -> personAny
+ (ProjectTicketReplyR _ _ _ _ , _ ) -> personAny
+ (ProjectTicketDepsR s j _ , True) -> projOp ProjOpAddTicketDep s j
+ (ProjectTicketDepNewR s j _ , _ ) -> projOp ProjOpAddTicketDep s j
(TicketDepOldR s j _ _ , True) -> projOp ProjOpRemoveTicketDep s j
_ -> return Authorized
where
@@ -905,71 +905,71 @@ instance YesodBreadcrumbs App where
, Just $ SharerR shr
)
- TicketsR shar proj -> ( "Tickets"
+ ProjectTicketsR shar proj -> ( "Tickets"
, Just $ ProjectR shar proj
)
- TicketTreeR shr prj -> ( "Tree", Just $ TicketsR shr prj)
- TicketNewR shar proj -> ("New", Just $ TicketsR shar proj)
- TicketR shar proj num -> ( T.pack $ '#' : show num
- , Just $ TicketsR shar proj
+ ProjectTicketTreeR shr prj -> ( "Tree", Just $ ProjectTicketsR shr prj)
+ ProjectTicketNewR shar proj -> ("New", Just $ ProjectTicketsR shar proj)
+ ProjectTicketR shar proj num -> ( T.pack $ '#' : show num
+ , Just $ ProjectTicketsR shar proj
)
- TicketEditR shar proj num -> ( "Edit"
- , Just $ TicketR shar proj num
+ ProjectTicketEditR shar proj num -> ( "Edit"
+ , Just $ ProjectTicketR shar proj num
)
- TicketAcceptR _shr _prj _num -> ("", Nothing)
- TicketCloseR _shar _proj _num -> ("", Nothing)
- TicketOpenR _shar _proj _num -> ("", Nothing)
- TicketClaimR _shar _proj _num -> ("", Nothing)
- TicketUnclaimR _shar _proj _num -> ("", Nothing)
- TicketAssignR shr prj num -> ( "Assign"
- , Just $ TicketR shr prj num
+ ProjectTicketAcceptR _shr _prj _num -> ("", Nothing)
+ ProjectTicketCloseR _shar _proj _num -> ("", Nothing)
+ ProjectTicketOpenR _shar _proj _num -> ("", Nothing)
+ ProjectTicketClaimR _shar _proj _num -> ("", Nothing)
+ ProjectTicketUnclaimR _shar _proj _num -> ("", Nothing)
+ ProjectTicketAssignR shr prj num -> ( "Assign"
+ , Just $ ProjectTicketR shr prj num
)
- TicketUnassignR _shr _prj _num -> ("", Nothing)
+ ProjectTicketUnassignR _shr _prj _num -> ("", Nothing)
ClaimRequestsProjectR shr prj -> ( "Ticket Claim Requests"
, Just $ ProjectR shr prj
)
ClaimRequestsTicketR shr prj num -> ( "Ticket Claim Requests"
- , Just $ TicketR shr prj num
+ , Just $ ProjectTicketR shr prj num
)
ClaimRequestNewR shr prj num -> ( "New"
, Just $
ClaimRequestsTicketR shr prj num
)
- TicketDiscussionR shar proj num -> ( "Discussion"
- , Just $ TicketR shar proj num
+ ProjectTicketDiscussionR shar proj num -> ( "Discussion"
+ , Just $ ProjectTicketR shar proj num
+ )
+ ProjectTicketMessageR shr prj num mkhid -> ( "#" <> keyHashidText mkhid
+ , Just $
+ ProjectTicketDiscussionR shr prj num
+ )
+ ProjectTicketTopReplyR shar proj num -> ( "New topic"
+ , Just $
+ ProjectTicketDiscussionR shar proj num
+ )
+ ProjectTicketReplyR shar proj num cnum -> ( "Reply"
+ , Just $
+ ProjectTicketMessageR shar proj num cnum
+ )
+ ProjectTicketDepsR shr prj num -> ( "Dependencies"
+ , Just $ ProjectTicketR shr prj num
)
- TicketMessageR shr prj num mkhid -> ( "#" <> keyHashidText mkhid
- , Just $
- TicketDiscussionR shr prj num
- )
- TicketTopReplyR shar proj num -> ( "New topic"
- , Just $
- TicketDiscussionR shar proj num
- )
- TicketReplyR shar proj num cnum -> ( "Reply"
- , Just $
- TicketMessageR shar proj num cnum
- )
- TicketDepsR shr prj num -> ( "Dependencies"
- , Just $ TicketR shr prj num
- )
- TicketDepNewR shr prj num -> ( "New dependency"
- , Just $ TicketDepsR shr prj num
+ ProjectTicketDepNewR shr prj num -> ( "New dependency"
+ , Just $ ProjectTicketDepsR shr prj num
)
TicketDepOldR shr prj pnum cnum -> ( T.pack $ '#' : show cnum
- , Just $ TicketDepsR shr prj pnum
+ , Just $ ProjectTicketDepsR shr prj pnum
)
- TicketReverseDepsR shr prj num -> ( "Dependants"
- , Just $ TicketR shr prj num
+ ProjectTicketReverseDepsR shr prj num -> ( "Dependants"
+ , Just $ ProjectTicketR shr prj num
+ )
+ ProjectTicketParticipantsR shr prj num -> ( "Participants"
+ , Just $ ProjectTicketR shr prj num
+ )
+ ProjectTicketTeamR shr prj num -> ( "Team"
+ , Just $ ProjectTicketR shr prj num
)
- TicketParticipantsR shr prj num -> ( "Participants"
- , Just $ TicketR shr prj num
- )
- TicketTeamR shr prj num -> ( "Team"
- , Just $ TicketR shr prj num
- )
- TicketEventsR shr prj num -> ( "Events"
- , Just $ TicketR shr prj num
+ ProjectTicketEventsR shr prj num -> ( "Events"
+ , Just $ ProjectTicketR shr prj num
)
WikiPageR shr prj _page -> ("Wiki", Just $ ProjectR shr prj)
diff --git a/src/Vervis/Handler/Client.hs b/src/Vervis/Handler/Client.hs
index 4873202..d8f0909 100644
--- a/src/Vervis/Handler/Client.hs
+++ b/src/Vervis/Handler/Client.hs
@@ -22,18 +22,18 @@ module Vervis.Handler.Client
, postSharerFollowR
, postProjectFollowR
- , postTicketFollowR
+ , postProjectTicketFollowR
, postRepoFollowR
, postSharerUnfollowR
, postProjectUnfollowR
- , postTicketUnfollowR
+ , postProjectTicketUnfollowR
, postRepoUnfollowR
, getNotificationsR
, postNotificationsR
- , postTicketsR
+ , postProjectTicketsR
)
where
@@ -133,10 +133,10 @@ ticketField encodeRouteLocal = checkMMap toTicket fromTicket fedUriField
Nothing -> throwE ("Not a valid route" :: Text)
Just r -> return r
case route of
- TicketR shr prj tkhid -> return (hTicket, shr, prj, tkhid)
+ ProjectTicketR shr prj tkhid -> return (hTicket, shr, prj, tkhid)
_ -> throwE "Not a ticket route"
fromTicket (h, shr, prj, tkhid) =
- ObjURI h $ encodeRouteLocal $ TicketR shr prj tkhid
+ ObjURI h $ encodeRouteLocal $ ProjectTicketR shr prj tkhid
projectField
:: (Route App -> LocalURI) -> Field Handler (Host, ShrIdent, PrjIdent)
@@ -328,12 +328,12 @@ postPublishR = do
let msg' = T.filter (/= '\r') msg
contentHtml <- ExceptT . pure $ renderPandocMarkdown msg'
let encodeRecipRoute = ObjURI hTicket . encodeRouteLocal
- uTicket = encodeRecipRoute $ TicketR shrTicket prj num
+ uTicket = encodeRecipRoute $ ProjectTicketR shrTicket prj num
ObjURI hLocal luAuthor = encodeRouteFed $ SharerR shrAuthor
collections =
[ ProjectFollowersR shrTicket prj
- , TicketParticipantsR shrTicket prj num
- , TicketTeamR shrTicket prj num
+ , ProjectTicketParticipantsR shrTicket prj num
+ , ProjectTicketTeamR shrTicket prj num
]
recips = ProjectR shrTicket prj : collections
note = Note
@@ -493,13 +493,13 @@ postProjectFollowR shrObject prjObject = do
setFollowMessage shrAuthor eid
redirect $ ProjectR shrObject prjObject
-postTicketFollowR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler ()
-postTicketFollowR shrObject prjObject tkhidObject = do
+postProjectTicketFollowR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler ()
+postProjectTicketFollowR shrObject prjObject tkhidObject = do
shrAuthor <- getUserShrIdent
(summary, audience, follow) <- followTicket shrAuthor shrObject prjObject tkhidObject False
eid <- followC shrAuthor summary audience follow
setFollowMessage shrAuthor eid
- redirect $ TicketR shrObject prjObject tkhidObject
+ redirect $ ProjectTicketR shrObject prjObject tkhidObject
postRepoFollowR :: ShrIdent -> RpIdent -> Handler ()
postRepoFollowR shrObject rpObject = do
@@ -540,15 +540,15 @@ postProjectUnfollowR shrFollowee prjFollowee = do
setUnfollowMessage shrAuthor eid
redirect $ ProjectR shrFollowee prjFollowee
-postTicketUnfollowR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler ()
-postTicketUnfollowR shrFollowee prjFollowee tkhidFollowee = do
+postProjectTicketUnfollowR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler ()
+postProjectTicketUnfollowR shrFollowee prjFollowee tkhidFollowee = do
(shrAuthor, pidAuthor) <- getUser
eid <- runExceptT $ do
(summary, audience, undo) <-
ExceptT $ undoFollowTicket shrAuthor pidAuthor shrFollowee prjFollowee tkhidFollowee
ExceptT $ undoC shrAuthor summary audience undo
setUnfollowMessage shrAuthor eid
- redirect $ TicketR shrFollowee prjFollowee tkhidFollowee
+ redirect $ ProjectTicketR shrFollowee prjFollowee tkhidFollowee
postRepoUnfollowR :: ShrIdent -> RpIdent -> Handler ()
postRepoUnfollowR shrFollowee rpFollowee = do
@@ -700,8 +700,8 @@ postNotificationsR shr = do
Left b -> liftIO $ throwIO $ userError $ if b then t else f
Right exy -> return exy
-postTicketsR :: ShrIdent -> PrjIdent -> Handler Html
-postTicketsR shr prj = do
+postProjectTicketsR :: ShrIdent -> PrjIdent -> Handler Html
+postProjectTicketsR shr prj = do
wid <- runDB $ do
sid <- getKeyBy404 $ UniqueSharer shr
j <- getValBy404 $ UniqueProject prj sid
@@ -776,4 +776,4 @@ postTicketsR shr prj = do
case eobiidFollow of
Left e -> setMessage $ toHtml $ "Ticket created, but following it failed: " <> e
Right _ -> setMessage "Ticket created."
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
diff --git a/src/Vervis/Handler/Discussion.hs b/src/Vervis/Handler/Discussion.hs
index ca4e8a0..cc2426c 100644
--- a/src/Vervis/Handler/Discussion.hs
+++ b/src/Vervis/Handler/Discussion.hs
@@ -145,7 +145,7 @@ getDiscussionMessage shr lmid = do
let shr = sharerIdent s
prj = projectIdent j
ltkhid <- encodeKeyHashid ltid
- return $ route2fed $ TicketR shr prj ltkhid
+ return $ route2fed $ ProjectTicketR shr prj ltkhid
(Nothing, Just rd) -> do
ro <- getJust $ remoteDiscussionIdent rd
i <- getJust $ remoteObjectInstance ro
diff --git a/src/Vervis/Handler/Sharer.hs b/src/Vervis/Handler/Sharer.hs
index 73327ac..65561a3 100644
--- a/src/Vervis/Handler/Sharer.hs
+++ b/src/Vervis/Handler/Sharer.hs
@@ -165,7 +165,7 @@ getSharerFollowingR shr = do
)
encodeHid <- getEncodeKeyHashid
return $
- map (\ (E.Value shr, E.Value prj, E.Value tid) -> TicketR shr prj $ encodeHid tid)
+ map (\ (E.Value shr, E.Value prj, E.Value tid) -> ProjectTicketR shr prj $ encodeHid tid)
triples
getRepos fsids = do
rids <- selectKeysList [RepoFollowers <-. fsids] []
diff --git a/src/Vervis/Handler/Ticket.hs b/src/Vervis/Handler/Ticket.hs
index ec14b45..ad9f6d2 100644
--- a/src/Vervis/Handler/Ticket.hs
+++ b/src/Vervis/Handler/Ticket.hs
@@ -14,43 +14,43 @@
-}
module Vervis.Handler.Ticket
- ( getTicketsR
- , getTicketTreeR
- , getTicketNewR
- , getTicketR
- , putTicketR
- , deleteTicketR
- , postTicketR
- , getTicketEditR
- , postTicketAcceptR
- , postTicketCloseR
- , postTicketOpenR
- , postTicketClaimR
- , postTicketUnclaimR
- , getTicketAssignR
- , postTicketAssignR
- , postTicketUnassignR
+ ( getProjectTicketsR
+ , getProjectTicketTreeR
+ , getProjectTicketNewR
+ , getProjectTicketR
+ , putProjectTicketR
+ , deleteProjectTicketR
+ , postProjectTicketR
+ , getProjectTicketEditR
+ , postProjectTicketAcceptR
+ , postProjectTicketCloseR
+ , postProjectTicketOpenR
+ , postProjectTicketClaimR
+ , postProjectTicketUnclaimR
+ , getProjectTicketAssignR
+ , postProjectTicketAssignR
+ , postProjectTicketUnassignR
, getClaimRequestsPersonR
, getClaimRequestsProjectR
, getClaimRequestsTicketR
, postClaimRequestsTicketR
, getClaimRequestNewR
- , getTicketDiscussionR
- , postTicketDiscussionR
+ , getProjectTicketDiscussionR
+ , postProjectTicketDiscussionR
, getMessageR
- , postTicketMessageR
- , getTicketTopReplyR
- , getTicketReplyR
- , getTicketDepsR
- , postTicketDepsR
- , getTicketDepNewR
+ , postProjectTicketMessageR
+ , getProjectTicketTopReplyR
+ , getProjectTicketReplyR
+ , getProjectTicketDepsR
+ , postProjectTicketDepsR
+ , getProjectTicketDepNewR
, postTicketDepOldR
, deleteTicketDepOldR
- , getTicketReverseDepsR
+ , getProjectTicketReverseDepsR
, getTicketDepR
- , getTicketParticipantsR
- , getTicketTeamR
- , getTicketEventsR
+ , getProjectTicketParticipantsR
+ , getProjectTicketTeamR
+ , getProjectTicketEventsR
, getSharerTicketsR
, getSharerTicketR
@@ -141,8 +141,8 @@ import Vervis.Widget.Discussion (discussionW)
import Vervis.Widget.Sharer
import Vervis.Widget.Ticket
-getTicketsR :: ShrIdent -> PrjIdent -> Handler TypedContent
-getTicketsR shr prj = selectRep $ do
+getProjectTicketsR :: ShrIdent -> PrjIdent -> Handler TypedContent
+getProjectTicketsR shr prj = selectRep $ do
provideRep $ do
((filtResult, filtWidget), filtEnctype) <- runFormGet ticketFilterForm
let tf =
@@ -239,17 +239,17 @@ getTicketsR shr prj = selectRep $ do
tickets
}
where
- here = TicketsR shr prj
+ here = ProjectTicketsR shr prj
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
+ (Nothing, Nothing, Nothing) -> ProjectTicketR shr prj $ encodeLT ltid
(Just talid, Just shrA, Nothing) -> SharerTicketR shrA $ encodeTAL talid
- (Just _, Just _, Just _) -> TicketR shr prj $ encodeLT ltid
+ (Just _, Just _, Just _) -> ProjectTicketR shr prj $ encodeLT ltid
_ -> error "Impossible"
-getTicketTreeR :: ShrIdent -> PrjIdent -> Handler Html
-getTicketTreeR shr prj = do
+getProjectTicketTreeR :: ShrIdent -> PrjIdent -> Handler Html
+getProjectTicketTreeR shr prj = do
(summaries, deps) <- runDB $ do
Entity sid _ <- getBy404 $ UniqueSharer shr
Entity jid _ <- getBy404 $ UniqueProject prj sid
@@ -257,8 +257,8 @@ getTicketTreeR shr prj = do
<*> getTicketDepEdges jid
defaultLayout $ ticketTreeDW shr prj summaries deps
-getTicketNewR :: ShrIdent -> PrjIdent -> Handler Html
-getTicketNewR shr prj = do
+getProjectTicketNewR :: ShrIdent -> PrjIdent -> Handler Html
+getProjectTicketNewR shr prj = do
wid <- runDB $ do
Entity sid _ <- getBy404 $ UniqueSharer shr
Entity _ j <- getBy404 $ UniqueProject prj sid
@@ -291,8 +291,8 @@ getProjectTicket shr prj ltkhid = do
"Ticket has both local and remote author"
return (es, ej, Entity tid t, Entity ltid lt, etpl, author)
-getTicketR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler TypedContent
-getTicketR shar proj ltkhid = do
+getProjectTicketR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler TypedContent
+getProjectTicketR shar proj ltkhid = do
mpid <- maybeAuthId
( wshr, wfl,
author, massignee, mcloser, ticket, lticket, tparams, eparams, cparams,
@@ -361,8 +361,8 @@ getTicketR shar proj ltkhid = do
discuss =
discussionW
(return $ localTicketDiscuss lticket)
- (TicketTopReplyR shar proj ltkhid)
- (TicketReplyR shar proj ltkhid . encodeHid)
+ (ProjectTicketTopReplyR shar proj ltkhid)
+ (ProjectTicketReplyR shar proj ltkhid . encodeHid)
cRelevant <- newIdent
cIrrelevant <- newIdent
let relevant filt =
@@ -383,19 +383,19 @@ getTicketR shar proj ltkhid = do
( hLocal
, AP.TicketLocal
{ AP.ticketId =
- encodeRouteLocal $ TicketR shar proj ltkhid
+ encodeRouteLocal $ ProjectTicketR shar proj ltkhid
, AP.ticketReplies =
- encodeRouteLocal $ TicketDiscussionR shar proj ltkhid
+ encodeRouteLocal $ ProjectTicketDiscussionR shar proj ltkhid
, AP.ticketParticipants =
- encodeRouteLocal $ TicketParticipantsR shar proj ltkhid
+ encodeRouteLocal $ ProjectTicketParticipantsR shar proj ltkhid
, AP.ticketTeam =
- encodeRouteLocal $ TicketTeamR shar proj ltkhid
+ encodeRouteLocal $ ProjectTicketTeamR shar proj ltkhid
, AP.ticketEvents =
- encodeRouteLocal $ TicketEventsR shar proj ltkhid
+ encodeRouteLocal $ ProjectTicketEventsR shar proj ltkhid
, AP.ticketDeps =
- encodeRouteLocal $ TicketDepsR shar proj ltkhid
+ encodeRouteLocal $ ProjectTicketDepsR shar proj ltkhid
, AP.ticketReverseDeps =
- encodeRouteLocal $ TicketReverseDepsR shar proj ltkhid
+ encodeRouteLocal $ ProjectTicketReverseDepsR shar proj ltkhid
}
)
@@ -420,13 +420,13 @@ getTicketR shar proj ltkhid = do
provideHtmlAndAP' host ticketAP $
let followButton =
followW
- (TicketFollowR shar proj ltkhid)
- (TicketUnfollowR shar proj ltkhid)
+ (ProjectTicketFollowR shar proj ltkhid)
+ (ProjectTicketUnfollowR shar proj ltkhid)
(return $ localTicketFollowers lticket)
in $(widgetFile "ticket/one")
-putTicketR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-putTicketR shr prj ltkhid = do
+putProjectTicketR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
+putProjectTicketR shr prj ltkhid = do
(tid, ticket, wid) <- runDB $ do
(_es, Entity _ project, Entity tid ticket, _elt, _etpl, _author) <- getProjectTicket shr prj ltkhid
return (tid, ticket, projectWorkflow project)
@@ -438,7 +438,7 @@ putTicketR shr prj ltkhid = do
case renderPandocMarkdown $ ticketSource ticket' of
Left err -> do
setMessage $ toHtml err
- redirect $ TicketEditR shr prj ltkhid
+ redirect $ ProjectTicketEditR shr prj ltkhid
Right t -> return t
let ticket'' = ticket' { ticketDescription = newDescHtml }
runDB $ do
@@ -477,7 +477,7 @@ putTicketR shr prj ltkhid = do
}
insertMany_ $ map mkcparam cins
setMessage "Ticket updated."
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
FormMissing -> do
setMessage "Field(s) missing."
defaultLayout $(widgetFile "ticket/edit")
@@ -485,22 +485,22 @@ putTicketR shr prj ltkhid = do
setMessage "Ticket update failed, see errors below."
defaultLayout $(widgetFile "ticket/edit")
-deleteTicketR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-deleteTicketR _shr _prj _ltkhid =
+deleteProjectTicketR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
+deleteProjectTicketR _shr _prj _ltkhid =
--TODO: I can easily implement this, but should it even be possible to
--delete tickets?
error "Not implemented"
-postTicketR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketR shr prj ltkhid = do
+postProjectTicketR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
+postProjectTicketR shr prj ltkhid = do
mmethod <- lookupPostParam "_method"
case mmethod of
- Just "PUT" -> putTicketR shr prj ltkhid
- Just "DELETE" -> deleteTicketR shr prj ltkhid
+ Just "PUT" -> putProjectTicketR shr prj ltkhid
+ Just "DELETE" -> deleteProjectTicketR shr prj ltkhid
_ -> notFound
-getTicketEditR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-getTicketEditR shr prj ltkhid = do
+getProjectTicketEditR :: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
+getProjectTicketEditR shr prj ltkhid = do
(tid, ticket, wid) <- runDB $ do
(_es, Entity _ project, Entity tid ticket, _elt, _etpl, _author) <- getProjectTicket shr prj ltkhid
return (tid, ticket, projectWorkflow project)
@@ -508,9 +508,9 @@ getTicketEditR shr prj ltkhid = do
runFormPost $ editTicketContentForm tid ticket wid
defaultLayout $(widgetFile "ticket/edit")
-postTicketAcceptR
+postProjectTicketAcceptR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketAcceptR shr prj ltkhid = do
+postProjectTicketAcceptR shr prj ltkhid = do
succ <- runDB $ do
(_es, _ej, Entity tid ticket, _elt, _etpl, _author) <- getProjectTicket shr prj ltkhid
case ticketStatus ticket of
@@ -522,11 +522,11 @@ postTicketAcceptR shr prj ltkhid = do
if succ
then "Ticket accepted."
else "Ticket is already accepted."
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
-postTicketCloseR
+postProjectTicketCloseR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketCloseR shr prj ltkhid = do
+postProjectTicketCloseR shr prj ltkhid = do
pid <- requireAuthId
now <- liftIO getCurrentTime
succ <- runDB $ do
@@ -545,11 +545,11 @@ postTicketCloseR shr prj ltkhid = do
if succ
then "Ticket closed."
else "Ticket is already closed."
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
-postTicketOpenR
+postProjectTicketOpenR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketOpenR shr prj ltkhid = do
+postProjectTicketOpenR shr prj ltkhid = do
pid <- requireAuthId
now <- liftIO getCurrentTime
succ <- runDB $ do
@@ -566,11 +566,11 @@ postTicketOpenR shr prj ltkhid = do
if succ
then "Ticket reopened"
else "Ticket is already open."
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
-postTicketClaimR
+postProjectTicketClaimR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketClaimR shr prj ltkhid = do
+postProjectTicketClaimR shr prj ltkhid = do
pid <- requireAuthId
mmsg <- runDB $ do
(_es, _ej, Entity tid ticket, _elt, _etpl, _author) <- getProjectTicket shr prj ltkhid
@@ -588,11 +588,11 @@ postTicketClaimR shr prj ltkhid = do
update tid [TicketAssignee =. Just pid]
return Nothing
setMessage $ fromMaybe "The ticket is now assigned to you." mmsg
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
-postTicketUnclaimR
+postProjectTicketUnclaimR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketUnclaimR shr prj ltkhid = do
+postProjectTicketUnclaimR shr prj ltkhid = do
pid <- requireAuthId
mmsg <- runDB $ do
(_es, _ej, Entity tid ticket, _elt, _etpl, _author) <- getProjectTicket shr prj ltkhid
@@ -613,16 +613,16 @@ postTicketUnclaimR shr prj ltkhid = do
update tid [TicketAssignee =. Nothing]
return Nothing
setMessage $ fromMaybe "The ticket is now unassigned." mmsg
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
-getTicketAssignR
+getProjectTicketAssignR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-getTicketAssignR shr prj ltkhid = do
+getProjectTicketAssignR shr prj ltkhid = do
vpid <- requireAuthId
(_es, Entity jid _, Entity tid ticket, _elt, _etpl, _author) <- runDB $ getProjectTicket shr prj ltkhid
let msg t = do
setMessage t
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
case (ticketStatus ticket, ticketAssignee ticket) of
(TSNew, _) -> msg "The ticket isn’t accepted yet. Can’t assign it."
(TSClosed, _) -> msg "The ticket is closed. Can’t assign it."
@@ -632,14 +632,14 @@ getTicketAssignR shr prj ltkhid = do
runFormPost $ assignTicketForm vpid jid
defaultLayout $(widgetFile "ticket/assign")
-postTicketAssignR
+postProjectTicketAssignR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketAssignR shr prj ltkhid = do
+postProjectTicketAssignR shr prj ltkhid = do
vpid <- requireAuthId
(_es, Entity jid _, Entity tid ticket, _elt, _etpl, _author) <- runDB $ getProjectTicket shr prj ltkhid
let msg t = do
setMessage t
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
case (ticketStatus ticket, ticketAssignee ticket) of
(TSNew, _) -> msg "The ticket isn’t accepted yet. Can’t assign it."
(TSClosed, _) -> msg "The ticket is closed. Can’t assign it."
@@ -663,9 +663,9 @@ postTicketAssignR shr prj ltkhid = do
setMessage "Ticket assignment failed, see errors below."
defaultLayout $(widgetFile "ticket/assign")
-postTicketUnassignR
+postProjectTicketUnassignR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketUnassignR shr prj ltkhid = do
+postProjectTicketUnassignR shr prj ltkhid = do
pid <- requireAuthId
mmsg <- runDB $ do
(_es, _ej, Entity tid ticket, _elt, _etpl, _author) <- getProjectTicket shr prj ltkhid
@@ -686,7 +686,7 @@ postTicketUnassignR shr prj ltkhid = do
update tid [TicketAssignee =. Nothing]
return Nothing
setMessage $ fromMaybe "The ticket is now unassigned." mmsg
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
-- | The logged-in user gets a list of the ticket claim requests they have
-- opened, in any project.
@@ -780,7 +780,7 @@ postClaimRequestsTicketR shr prj ltkhid = do
}
insert_ cr
setMessage "Ticket claim request opened."
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
FormMissing -> do
setMessage "Field(s) missing."
defaultLayout $(widgetFile "ticket/claim-request/new")
@@ -794,43 +794,43 @@ selectDiscussionId shr prj ltkhid = do
(_es, _ej, _et, Entity _ lticket, _etpl, _author) <- getProjectTicket shr prj ltkhid
return $ localTicketDiscuss lticket
-getTicketDiscussionR
+getProjectTicketDiscussionR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-getTicketDiscussionR shar proj ltkhid = do
+getProjectTicketDiscussionR shar proj ltkhid = do
encodeHid <- getEncodeKeyHashid
getDiscussion
- (TicketReplyR shar proj ltkhid . encodeHid)
- (TicketTopReplyR shar proj ltkhid)
+ (ProjectTicketReplyR shar proj ltkhid . encodeHid)
+ (ProjectTicketTopReplyR shar proj ltkhid)
(selectDiscussionId shar proj ltkhid)
-postTicketDiscussionR
+postProjectTicketDiscussionR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketDiscussionR shr prj ltkhid = do
+postProjectTicketDiscussionR shr prj ltkhid = do
hLocal <- getsYesod $ appInstanceHost . appSettings
postTopReply
hLocal
[ProjectR shr prj]
[ ProjectFollowersR shr prj
- , TicketParticipantsR shr prj ltkhid
- , TicketTeamR shr prj ltkhid
+ , ProjectTicketParticipantsR shr prj ltkhid
+ , ProjectTicketTeamR shr prj ltkhid
]
- (TicketR shr prj ltkhid)
+ (ProjectTicketR shr prj ltkhid)
(ProjectR shr prj)
- (TicketDiscussionR shr prj ltkhid)
- (const $ TicketR shr prj ltkhid)
+ (ProjectTicketDiscussionR shr prj ltkhid)
+ (const $ ProjectTicketR shr prj ltkhid)
getMessageR :: ShrIdent -> KeyHashid LocalMessage -> Handler TypedContent
getMessageR shr hid = do
lmid <- decodeKeyHashid404 hid
getDiscussionMessage shr lmid
-postTicketMessageR
+postProjectTicketMessageR
:: ShrIdent
-> PrjIdent
-> KeyHashid LocalTicket
-> KeyHashid Message
-> Handler Html
-postTicketMessageR shr prj ltkhid mkhid = do
+postProjectTicketMessageR shr prj ltkhid mkhid = do
encodeHid <- getEncodeKeyHashid
mid <- decodeKeyHashid404 mkhid
hLocal <- getsYesod $ appInstanceHost . appSettings
@@ -838,30 +838,30 @@ postTicketMessageR shr prj ltkhid mkhid = do
hLocal
[ProjectR shr prj]
[ ProjectFollowersR shr prj
- , TicketParticipantsR shr prj ltkhid
- , TicketTeamR shr prj ltkhid
+ , ProjectTicketParticipantsR shr prj ltkhid
+ , ProjectTicketTeamR shr prj ltkhid
]
- (TicketR shr prj ltkhid)
+ (ProjectTicketR shr prj ltkhid)
(ProjectR shr prj)
- (TicketReplyR shr prj ltkhid . encodeHid)
- (TicketMessageR shr prj ltkhid . encodeHid)
- (const $ TicketR shr prj ltkhid)
+ (ProjectTicketReplyR shr prj ltkhid . encodeHid)
+ (ProjectTicketMessageR shr prj ltkhid . encodeHid)
+ (const $ ProjectTicketR shr prj ltkhid)
(selectDiscussionId shr prj ltkhid)
mid
-getTicketTopReplyR
+getProjectTicketTopReplyR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-getTicketTopReplyR shr prj ltkhid =
- getTopReply $ TicketDiscussionR shr prj ltkhid
+getProjectTicketTopReplyR shr prj ltkhid =
+ getTopReply $ ProjectTicketDiscussionR shr prj ltkhid
-getTicketReplyR
+getProjectTicketReplyR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> KeyHashid Message -> Handler Html
-getTicketReplyR shr prj ltkhid mkhid = do
+getProjectTicketReplyR shr prj ltkhid mkhid = do
encodeHid <- getEncodeKeyHashid
mid <- decodeKeyHashid404 mkhid
getReply
- (TicketReplyR shr prj ltkhid . encodeHid)
- (TicketMessageR shr prj ltkhid . encodeHid)
+ (ProjectTicketReplyR shr prj ltkhid . encodeHid)
+ (ProjectTicketMessageR shr prj ltkhid . encodeHid)
(selectDiscussionId shr prj ltkhid)
mid
@@ -928,7 +928,10 @@ getTicketDeps forward shr prj ltkhid = do
encodeRouteHome <- getEncodeRouteHome
encodeKeyHashid <- getEncodeKeyHashid
let here =
- let route = if forward then TicketDepsR else TicketReverseDepsR
+ let route =
+ if forward
+ then ProjectTicketDepsR
+ else ProjectTicketReverseDepsR
in route shr prj ltkhid
return Collection
{ collectionId = encodeRouteLocal here
@@ -941,13 +944,13 @@ getTicketDeps forward shr prj ltkhid = do
map (encodeRouteHome . TicketDepR . encodeKeyHashid) tdids
}
-getTicketDepsR
+getProjectTicketDepsR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler TypedContent
-getTicketDepsR = getTicketDeps True
+getProjectTicketDepsR = getTicketDeps True
-postTicketDepsR
+postProjectTicketDepsR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-postTicketDepsR shr prj ltkhid = do
+postProjectTicketDepsR shr prj ltkhid = do
(_es, Entity jid _, Entity tid _, _elt, _etpl, _author) <- runDB $ getProjectTicket shr prj ltkhid
((result, widget), enctype) <- runFormPost $ ticketDepForm jid tid
case result of
@@ -965,7 +968,7 @@ postTicketDepsR shr prj ltkhid = do
insert_ td
trrFix td ticketDepGraph
setMessage "Ticket dependency added."
- redirect $ TicketR shr prj ltkhid
+ redirect $ ProjectTicketR shr prj ltkhid
FormMissing -> do
setMessage "Field(s) missing."
defaultLayout $(widgetFile "ticket/dep/new")
@@ -973,9 +976,9 @@ postTicketDepsR shr prj ltkhid = do
setMessage "Submission failed, see errors below."
defaultLayout $(widgetFile "ticket/dep/new")
-getTicketDepNewR
+getProjectTicketDepNewR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler Html
-getTicketDepNewR shr prj ltkhid = do
+getProjectTicketDepNewR shr prj ltkhid = do
(_es, Entity jid _, Entity tid _, _elt, _etpl, _author) <- runDB $ getProjectTicket shr prj ltkhid
((_result, widget), enctype) <- runFormPost $ ticketDepForm jid tid
defaultLayout $(widgetFile "ticket/dep/new")
@@ -1003,11 +1006,11 @@ deleteTicketDepOldR shr prj pnum cnum = do
Entity tdid _ <- getBy404 $ UniqueTicketDependency ptid ctid
delete tdid
setMessage "Ticket dependency removed."
- redirect $ TicketDepsR shr prj pnum
+ redirect $ ProjectTicketDepsR shr prj pnum
-getTicketReverseDepsR
+getProjectTicketReverseDepsR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler TypedContent
-getTicketReverseDepsR = getTicketDeps False
+getProjectTicketReverseDepsR = getTicketDeps False
getTicketDepR :: KeyHashid TicketDependency -> Handler TypedContent
getTicketDepR tdkhid = do
@@ -1027,7 +1030,7 @@ getTicketDepR tdkhid = do
encodeRouteHome <- getEncodeRouteHome
encodeHid <- getEncodeKeyHashid
let ticketRoute s j lt =
- TicketR (sharerIdent s) (projectIdent j) (encodeHid lt)
+ ProjectTicketR (sharerIdent s) (projectIdent j) (encodeHid lt)
here = TicketDepR tdkhid
tdepAP = AP.TicketDependency
{ ticketDepId = Just $ encodeRouteHome here
@@ -1063,18 +1066,18 @@ getTicketDepR tdkhid = do
s <- getJust $ personIdent p
return (s, p)
-getTicketParticipantsR
+getProjectTicketParticipantsR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler TypedContent
-getTicketParticipantsR shr prj ltkhid = getFollowersCollection here getFsid
+getProjectTicketParticipantsR shr prj ltkhid = getFollowersCollection here getFsid
where
- here = TicketParticipantsR shr prj ltkhid
+ here = ProjectTicketParticipantsR shr prj ltkhid
getFsid = do
(_es, _ej, _et, Entity _ lt, _etpl, _author) <- getProjectTicket shr prj ltkhid
return $ localTicketFollowers lt
-getTicketTeamR
+getProjectTicketTeamR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler TypedContent
-getTicketTeamR shr prj ltkhid = do
+getProjectTicketTeamR shr prj ltkhid = do
memberShrs <- runDB $ do
(Entity sid _, _ej, _et, _elt, _etpl, _author) <- getProjectTicket shr prj ltkhid
id_ <-
@@ -1095,7 +1098,7 @@ getTicketTeamR shr prj ltkhid = do
map (sharerIdent . entityVal) <$>
selectList [SharerId <-. sids] []
- let here = TicketTeamR shr prj ltkhid
+ let here = ProjectTicketTeamR shr prj ltkhid
encodeRouteLocal <- getEncodeRouteLocal
encodeRouteHome <- getEncodeRouteHome
@@ -1110,9 +1113,9 @@ getTicketTeamR shr prj ltkhid = do
}
provideHtmlAndAP team $ redirectToPrettyJSON here
-getTicketEventsR
+getProjectTicketEventsR
:: ShrIdent -> PrjIdent -> KeyHashid LocalTicket -> Handler TypedContent
-getTicketEventsR _shr _prj _ltkhid = error "TODO not implemented"
+getProjectTicketEventsR _shr _prj _ltkhid = error "TODO not implemented"
getSharerTicket
:: ShrIdent
diff --git a/src/Vervis/Migration.hs b/src/Vervis/Migration.hs
index fe60c78..a5a256d 100644
--- a/src/Vervis/Migration.hs
+++ b/src/Vervis/Migration.hs
@@ -932,7 +932,7 @@ changes hLocal ctx =
./s/#{shr2text shrProject}/p/#{prj2text prj}
: #
-
+
#{preEscapedToHtml $ ticket20190624Title ticket}.
|]
doc mluAct = Doc hLocal Activity
@@ -946,7 +946,7 @@ changes hLocal ctx =
{ acceptObject = encodeRouteHome offerR
, acceptResult =
Just $ encodeRouteLocal $
- TicketR shrProject prj $ encodeHid $ toSqlKey $ fromSqlKey tid
+ ProjectTicketR shrProject prj $ encodeHid $ toSqlKey $ fromSqlKey tid
}
}
obiidNew <- insert OutboxItem20190624
diff --git a/src/Vervis/Widget/Ticket.hs b/src/Vervis/Widget/Ticket.hs
index 6051cf7..d7f4b2c 100644
--- a/src/Vervis/Widget/Ticket.hs
+++ b/src/Vervis/Widget/Ticket.hs
@@ -92,7 +92,7 @@ ticketSummaryW shr prj ts mcs = do
case tsCreatedBy summary of
Left (s, Just talid) ->
SharerTicketR (sharerIdent s) (encodeTAL talid)
- _ -> TicketR shr prj $ encodeLT $ tsId summary
+ _ -> ProjectTicketR shr prj $ encodeLT $ tsId summary
-- I'm noticing a pattern. A problem. Some of my widget functions take data and
-- directly represent it in HTML. Others take some other more general
diff --git a/templates/person/claim-requests.hamlet b/templates/person/claim-requests.hamlet
index eb091fe..c98d7d9 100644
--- a/templates/person/claim-requests.hamlet
+++ b/templates/person/claim-requests.hamlet
@@ -25,8 +25,8 @@ $#