DB: Remote Ticket.status field
This commit is contained in:
parent
b0e4656723
commit
fa7f765e2e
6 changed files with 8 additions and 6 deletions
|
@ -708,7 +708,6 @@ applyC (Entity senderPersonID senderPerson) senderActor maybeCap localRecips rem
|
||||||
{ ticketResolveLocalTicket = trid
|
{ ticketResolveLocalTicket = trid
|
||||||
, ticketResolveLocalActivity = applyID
|
, ticketResolveLocalActivity = applyID
|
||||||
}
|
}
|
||||||
update ticketID [TicketStatus =. TSClosed]
|
|
||||||
|
|
||||||
prepareAccept luApply actors stages = do
|
prepareAccept luApply actors stages = do
|
||||||
encodeRouteHome <- getEncodeRouteHome
|
encodeRouteHome <- getEncodeRouteHome
|
||||||
|
@ -2354,7 +2353,6 @@ offerTicketC (Entity senderPersonID senderPerson) senderActor maybeCap localReci
|
||||||
, ticketTitle = title
|
, ticketTitle = title
|
||||||
, ticketSource = source
|
, ticketSource = source
|
||||||
, ticketDescription = desc
|
, ticketDescription = desc
|
||||||
, ticketStatus = TSNew
|
|
||||||
, ticketDiscuss = did
|
, ticketDiscuss = did
|
||||||
, ticketFollowers = fsid
|
, ticketFollowers = fsid
|
||||||
, ticketAccept = acceptID
|
, ticketAccept = acceptID
|
||||||
|
|
|
@ -425,7 +425,6 @@ deckOfferTicketF now recipDeckHash author body mfwd luOffer ticket uTarget = do
|
||||||
, ticketTitle = title
|
, ticketTitle = title
|
||||||
, ticketSource = source
|
, ticketSource = source
|
||||||
, ticketDescription = desc
|
, ticketDescription = desc
|
||||||
, ticketStatus = TSNew
|
|
||||||
, ticketDiscuss = did
|
, ticketDiscuss = did
|
||||||
, ticketFollowers = fsid
|
, ticketFollowers = fsid
|
||||||
, ticketAccept = acceptID
|
, ticketAccept = acceptID
|
||||||
|
@ -734,7 +733,6 @@ loomOfferTicketF now recipLoomHash author body mfwd luOffer ticket uTarget = do
|
||||||
, ticketTitle = title
|
, ticketTitle = title
|
||||||
, ticketSource = source
|
, ticketSource = source
|
||||||
, ticketDescription = desc
|
, ticketDescription = desc
|
||||||
, ticketStatus = TSNew
|
|
||||||
, ticketDiscuss = did
|
, ticketDiscuss = did
|
||||||
, ticketFollowers = fsid
|
, ticketFollowers = fsid
|
||||||
, ticketAccept = acceptID
|
, ticketAccept = acceptID
|
||||||
|
@ -1256,7 +1254,6 @@ loomApplyF now recipLoomHash author body mfwd luApply apply = (,Nothing) <$> do
|
||||||
, ticketResolveRemoteActivity = applyID
|
, ticketResolveRemoteActivity = applyID
|
||||||
, ticketResolveRemoteActor = remoteAuthorId author
|
, ticketResolveRemoteActor = remoteAuthorId author
|
||||||
}
|
}
|
||||||
update ticketID [TicketStatus =. TSClosed]
|
|
||||||
|
|
||||||
prepareAccept clothID = do
|
prepareAccept clothID = do
|
||||||
encodeRouteHome <- getEncodeRouteHome
|
encodeRouteHome <- getEncodeRouteHome
|
||||||
|
|
|
@ -356,10 +356,13 @@ getClothR loomHash clothHash = do
|
||||||
cIrrelevant <- newIdent
|
cIrrelevant <- newIdent
|
||||||
let relevant filt =
|
let relevant filt =
|
||||||
bool cIrrelevant cRelevant $
|
bool cIrrelevant cRelevant $
|
||||||
|
{-
|
||||||
case ticketStatus ticket of
|
case ticketStatus ticket of
|
||||||
TSNew -> wffNew filt
|
TSNew -> wffNew filt
|
||||||
TSTodo -> wffTodo filt
|
TSTodo -> wffTodo filt
|
||||||
TSClosed -> wffClosed filt
|
TSClosed -> wffClosed filt
|
||||||
|
-}
|
||||||
|
True
|
||||||
let followButton =
|
let followButton =
|
||||||
followW
|
followW
|
||||||
(ClothFollowR loomHash clothHash)
|
(ClothFollowR loomHash clothHash)
|
||||||
|
|
|
@ -291,10 +291,13 @@ getTicketR deckHash ticketHash = do
|
||||||
cIrrelevant <- newIdent
|
cIrrelevant <- newIdent
|
||||||
let relevant filt =
|
let relevant filt =
|
||||||
bool cIrrelevant cRelevant $
|
bool cIrrelevant cRelevant $
|
||||||
|
{-
|
||||||
case ticketStatus ticket of
|
case ticketStatus ticket of
|
||||||
TSNew -> wffNew filt
|
TSNew -> wffNew filt
|
||||||
TSTodo -> wffTodo filt
|
TSTodo -> wffTodo filt
|
||||||
TSClosed -> wffClosed filt
|
TSClosed -> wffClosed filt
|
||||||
|
-}
|
||||||
|
True
|
||||||
let followButton =
|
let followButton =
|
||||||
followW
|
followW
|
||||||
(TicketFollowR deckHash ticketHash)
|
(TicketFollowR deckHash ticketHash)
|
||||||
|
|
|
@ -2931,6 +2931,8 @@ changes hLocal ctx =
|
||||||
"CollabFulfillsInvite"
|
"CollabFulfillsInvite"
|
||||||
-- 528
|
-- 528
|
||||||
, addUnique' "CollabRecipRemoteAccept" "Invite" ["invite"]
|
, addUnique' "CollabRecipRemoteAccept" "Invite" ["invite"]
|
||||||
|
-- 529
|
||||||
|
, removeField "Ticket" "status"
|
||||||
]
|
]
|
||||||
|
|
||||||
migrateDB
|
migrateDB
|
||||||
|
|
|
@ -395,7 +395,6 @@ Ticket
|
||||||
title Text
|
title Text
|
||||||
source PandocMarkdown
|
source PandocMarkdown
|
||||||
description HTML
|
description HTML
|
||||||
status TicketStatus
|
|
||||||
discuss DiscussionId
|
discuss DiscussionId
|
||||||
followers FollowerSetId
|
followers FollowerSetId
|
||||||
accept OutboxItemId
|
accept OutboxItemId
|
||||||
|
|
Loading…
Reference in a new issue