Rgr #239
Merged
Rgr #239
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
Codecov Report
@@ Coverage Diff @@
## master #239 +/- ##
=========================================
- Coverage 83.11% 83.1% -0.01%
=========================================
Files 65 65
Lines 8141 8231 +90
=========================================
+ Hits 6766 6840 +74
- Misses 1375 1391 +16
Continue to review full report at Codecov.
|
hhyo
requested changes
May 31, 2019
sql/models.py
Outdated
| class InstanceTag(models.Model): | ||
| """实例标签配置""" | ||
| tag_code = models.CharField('标签代码', max_length=20, unique=True) | ||
| tag_name = models.CharField('标签名称', max_length=20, unique=True) | ||
| active = models.BooleanField('激活状态', default=True) | ||
| create_time = models.DateTimeField('创建时间', auto_now_add=True) | ||
| instances = models.ManyToManyField(Instance,through='InstanceTagRelations',through_fields=('instance_tag','instance')) |
sql/templates/groupmgmt.html
Outdated
| formatter: function (value, row, index) { | ||
| switch (row.object_type) { | ||
| case 0: | ||
| return "<a href=\"/admin/sql/users/" + row.object_id + "/change/\">" + value + "</a>"; | ||
| return "<a href=\"/admin/sql/users/" + row.object_id + "/change/\">" + row.object_id__username + "</a>"; |
sql/resource_group.py
Outdated
| 'create_time') | ||
| rows = [row for row in rows] | ||
| if object_type == '0': | ||
| rows_obj = rows_objusers |
|
这个功能这次发布过了再合吧，先合几个bug修复，不要关pr！ |
|
你已经很久没有回复这个issue了，如果没有进一步的信息的话， 会作为不活跃issue关闭， 感谢你对本项目的贡献。 |
实例标签使用系统自己manytomany
用户和实例添加页面新增资源组关联操作，便于维护
hhyo
approved these changes
Jun 7, 2019
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.
拆分资源关联表为2张
将标签和实例改为关联表