Add srv_sha1 & proc_sha1
Brightcells
共有 3 个文件被更改，包括 31 次插入 和 1 次删除
+ 3
- 1
operation/admin.py
@@ -149,13 +149,15 @@ class GuestEntranceControlInfoAdmin(admin.ModelAdmin): |
||
| 149 | 149 |
|
| 150 | 150 |
|
| 151 | 151 |
class BoxProgramVersionInfoAdmin(admin.ModelAdmin): |
| 152 |
- list_display = ('srv_version_code', 'srv_version_name', 'proc_version_code', 'proc_version_name', 'status', 'created_at', 'updated_at')
|
|
| 152 |
+ list_display = ('srv_version_code', 'srv_version_name', 'srv_sha1', 'proc_version_code', 'proc_version_name', 'proc_sha1', 'status', 'created_at', 'updated_at')
|
|
| 153 | 153 |
list_filter = ('status', )
|
| 154 | 154 |
actions = None |
| 155 | 155 |
|
| 156 | 156 |
def save_model(self, request, obj, form, change): |
| 157 | 157 |
obj.srv_version_name = strip(obj.srv_version_name) |
| 158 |
+ obj.srv_sha1 = strip(obj.srv_sha1) |
|
| 158 | 159 |
obj.proc_version_name = strip(obj.proc_version_name) |
| 160 |
+ obj.proc_sha1 = strip(obj.proc_sha1) |
|
| 159 | 161 |
obj.save() |
| 160 | 162 |
|
| 161 | 163 |
# 设置 BOX 程序版本信息 |
+ 24
- 0
operation/migrations/0013_auto_20170418_1451.py
@@ -0,0 +1,24 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+from __future__ import unicode_literals |
|
| 3 |
+ |
|
| 4 |
+from django.db import models, migrations |
|
| 5 |
+ |
|
| 6 |
+ |
|
| 7 |
+class Migration(migrations.Migration): |
|
| 8 |
+ |
|
| 9 |
+ dependencies = [ |
|
| 10 |
+ ('operation', '0012_boxprogramversioninfo'),
|
|
| 11 |
+ ] |
|
| 12 |
+ |
|
| 13 |
+ operations = [ |
|
| 14 |
+ migrations.AddField( |
|
| 15 |
+ model_name='boxprogramversioninfo', |
|
| 16 |
+ name='proc_sha1', |
|
| 17 |
+ field=models.CharField(help_text='Box Proc Commit SHA1', max_length=255, null=True, verbose_name='proc_sha1', blank=True), |
|
| 18 |
+ ), |
|
| 19 |
+ migrations.AddField( |
|
| 20 |
+ model_name='boxprogramversioninfo', |
|
| 21 |
+ name='srv_sha1', |
|
| 22 |
+ field=models.CharField(help_text='Box Server Commit SHA1', max_length=255, null=True, verbose_name='srv_sha1', blank=True), |
|
| 23 |
+ ), |
|
| 24 |
+ ] |
+ 4
- 0
operation/models.py
@@ -153,9 +153,11 @@ class GuestEntranceControlInfo(CreateUpdateMixin, PlatformMixin, VersionMixin, P |
||
| 153 | 153 |
class BoxProgramVersionInfo(CreateUpdateMixin): |
| 154 | 154 |
srv_version_code = models.IntegerField(_(u'srv_version_code'), default=0, help_text=u'Box Server 版本号') |
| 155 | 155 |
srv_version_name = models.CharField(_(u'srv_version_name'), max_length=255, blank=True, null=True, help_text=u'Box Server 版本名') |
| 156 |
+ srv_sha1 = models.CharField(_(u'srv_sha1'), max_length=255, blank=True, null=True, help_text=u'Box Server Commit SHA1') |
|
| 156 | 157 |
|
| 157 | 158 |
proc_version_code = models.IntegerField(_(u'proc_version_code'), default=0, help_text=u'Box Proc 版本号') |
| 158 | 159 |
proc_version_name = models.CharField(_(u'proc_version_name'), max_length=255, blank=True, null=True, help_text=u'Box Proc 版本名') |
| 160 |
+ proc_sha1 = models.CharField(_(u'proc_sha1'), max_length=255, blank=True, null=True, help_text=u'Box Proc Commit SHA1') |
|
| 159 | 161 |
|
| 160 | 162 |
class Meta: |
| 161 | 163 |
verbose_name = _('boxprogramversioninfo')
|
@@ -169,6 +171,8 @@ class BoxProgramVersionInfo(CreateUpdateMixin): |
||
| 169 | 171 |
return {
|
| 170 | 172 |
'srv_version_code': self.srv_version_code, |
| 171 | 173 |
'srv_version_name': self.srv_version_name, |
| 174 |
+ 'srv_sha1': self.srv_sha1, |
|
| 172 | 175 |
'proc_version_code': self.proc_version_code, |
| 173 | 176 |
'proc_version_name': self.proc_version_name, |
| 177 |
+ 'proc_sha1': self.proc_sha1, |
|
| 174 | 178 |
} |