Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修改手工工单逻辑, 调整详情页兼容无执行结果 #180

Merged
merged 4 commits into from
May 9, 2019
Merged

修改手工工单逻辑, 调整详情页兼容无执行结果 #180

merged 4 commits into from
May 9, 2019

Conversation

LeoQuote
Copy link
Collaborator

@LeoQuote LeoQuote commented May 8, 2019

  • 手工执行工单不再单独拥有一个状态
  • 详情页解析会考虑到json解析失败和json解析后为空列表等情况

@LeoQuote
修改手工工单逻辑, 调整详情页兼容无执行结果
3488646 
* 手工执行工单不再单独拥有一个状态
* 详情页解析会考虑到json解析失败和json解析后为空列表等情况
@codecov
Copy link

codecov bot commented May 8, 2019 •
edited
Loading

Codecov Report

Merging #180 into master will increase coverage by 0.08%.
The diff coverage is 87.5%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #180      +/-   ##
==========================================
+ Coverage   74.18%   74.26%   +0.08%     
==========================================
  Files          62       62              
  Lines        6760     6778      +18     
==========================================
+ Hits         5015     5034      +19     
+ Misses       1745     1744       -1
Impacted Files Coverage Δ
sql/models.py 94.57% <ø> (ø) ⬆️
sql/tests.py 100% <100%> (ø) ⬆️
sql/sql_workflow.py 62.19% <100%> (ø) ⬆️
sql/views.py 42.07% <75%> (+3.21%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 342b596...621e32a. Read the comment docs.

hhyo
hhyo approved these changes May 8, 2019
View reviewed changes
Copy link
Owner

@hhyo hhyo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

详情页兼容，确实没想到

@hhyo hhyo merged commit 592718e into master May 9, 2019
hhyo
hhyo reviewed May 9, 2019
View reviewed changes
sql/views.py
review_result.rows += [ReviewResult(inception_result=r)]
rows = review_result.json()
except json.decoder.JSONDecodeError:
review_result.rows += [ReviewResult(
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这样就不会显示提交的语句了，可以考虑decode失败的就展示提交信息

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

没注意这点，可以在reviewresult里加上。

hhyo added a commit that referenced this pull request May 9, 2019
@hhyo
* SQL上线新增配置项manual，控制是否开启手工执行确认的功能
04be846 
* 确认手工执行结束的工单，详情展示的信息为提交信息
#178 #180
@LeoQuote LeoQuote deleted the bugfix/manual-issues branch May 14, 2019 04:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hhyo hhyo hhyo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@LeoQuote @hhyo