增加sql上线可执行时间选择，且审核人可修改这个时间 #260
Merged
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
hhyo
reviewed
Jun 10, 2019
sql/models.py
Outdated
| @@ -193,6 +193,8 @@ class SqlWorkflow(models.Model): | |||
| engineer_display = models.CharField('发起人中文名', max_length=50, default='') | |||
| status = models.CharField(max_length=50, choices=SQL_WORKFLOW_CHOICES) | |||
| audit_auth_groups = models.CharField('审批权限组列表', max_length=255) | |||
| starttime = models.DateTimeField('可执行起始时间', null=True, blank=True) | |||
There was a problem hiding this comment.
如果没有更好的名字就直接用这两个吧，但是还是按照规范使用start_time、end_time
sql/sql_workflow.py
Outdated
| @@ -126,6 +126,8 @@ def submit(request): | |||
| is_backup = True if request.POST.get('is_backup') == 'True' else False | |||
| notify_users = request.POST.getlist('notify_users') | |||
| list_cc_addr = [email['email'] for email in Users.objects.filter(username__in=notify_users).values('email')] | |||
| starttime = request.POST['run_date_start'] | |||
sql/templates/sqlsubmit.html
Outdated
| @@ -91,6 +91,19 @@ | |||
| {% endfor %} | |||
| </select> | |||
| </div> | |||
| <!--可执行时间--> | |||
| <div class="form-group"> | |||
There was a problem hiding this comment.
删除这个div，在下面的div的class中加入form-group属性，类似<div class='form-group input-group date '
Codecov Report
@@ Coverage Diff @@
## master #260 +/- ##
==========================================
+ Coverage 83.2% 83.72% +0.52%
==========================================
Files 65 65
Lines 8252 8393 +141
==========================================
+ Hits 6866 7027 +161
+ Misses 1386 1366 -20
Continue to review full report at Codecov.
|
|
@yzypals 做了一部分调整，看下是否合适，确认后就可以合并 |
|
可以的 规范了很多 |
定时执行也判断是否在执行时间范围内 修改部分变量定义，补充数据库变更脚本 补充测试用例
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.
增加sql上线可执行时间选择，且审核人可修改这个时间
修复了几个 空时间错误的问题