flow_approver #128
Merged
flow_approver #128
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…desk into approvers_provider
|
@LeoQuote 基本功能应该差不多，有空review一下？ |
LeoQuote
reviewed
Aug 22, 2022
helpdesk/models/db/ticket.py
Outdated
| @@ -209,7 +229,8 @@ def check_confirmed(self): | |||
|
|
|||
| def set_approval_log(self, by_user=SYSTEM_USER, operated_type="approved"): | |||
| approval_log = self.annotation.get("approval_log") | |||
| approval_log.append(dict(node=self.annotation.get("current_node"), approver=by_user, operated_type=operated_type, operated_at=datetime.now().strftime("%Y-%m-%d %H:%M:%S"))) | |||
| operated_at = datetime.now().astimezone(timezone('Asia/Shanghai')).strftime("%Y-%m-%d %H:%M:%S") | |||
There was a problem hiding this comment.
保持现状? 记录 utc 时间如何? 以前是记录什么时间的?
There was a problem hiding this comment.
那就 utc 时间, 通知渲染的时候再转成当地时间
LeoQuote
reviewed
Aug 22, 2022
helpdesk/views/api/index.py
Outdated
| @@ -162,6 +162,8 @@ async def ticket_op(ticket_id: int, op: str, | |||
| "申请人才可主动关闭工单" | |||
| if ticket.submitter != current_user.name: | |||
| raise HTTPException(status_code=403, detail='Permission denied, only submitter can close') | |||
| if ticket.status != "pending": | |||
| raise HTTPException(status_code=403, detail='Permission denied, can not close in this ticket status') | |||
There was a problem hiding this comment.
Suggested change
| raise HTTPException(status_code=403, detail='Permission denied, can not close in this ticket status') | |
| raise HTTPException(status_code=400, detail='Ticket not pending, can not be closed') |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
related: #114
审批流后续开发：