diff --git a/apps/assets/models.py b/apps/assets/models.py index 5ceca9647..46d13922e 100644 --- a/apps/assets/models.py +++ b/apps/assets/models.py @@ -322,8 +322,8 @@ class Asset(models.Model): created_by = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Created by')) is_active = models.BooleanField(default=True, verbose_name=_('Is active')) date_created = models.DateTimeField(auto_now_add=True, null=True, blank=True, verbose_name=_('Date added')) - comment = models.TextField(max_length=128, null=True, blank=True, verbose_name=_('Comment')) - tags = models.ManyToManyField('Tag', verbose_name='标签集合', blank=True) + comment = models.TextField(max_length=128, default='', blank=True, verbose_name=_('Comment')) + tags = models.ManyToManyField('Tag', blank=True, verbose_name=_('Tags')) def __unicode__(self): return '%(ip)s:%(port)s' % {'ip': self.ip, 'port': self.port} diff --git a/apps/audits/api.py b/apps/audits/api.py index 8b20f16c2..4f11f6d68 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -2,10 +2,10 @@ # +from __future__ import absolute_import, unicode_literals from rest_framework import generics -import serializers -import models +from . import models, serializers from .hands import IsSuperUserOrTerminalUser, Terminal diff --git a/apps/audits/serializers.py b/apps/audits/serializers.py index 1b2485657..aaf9c3f68 100644 --- a/apps/audits/serializers.py +++ b/apps/audits/serializers.py @@ -1,9 +1,9 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- -# +# +from __future__ import absolute_import, unicode_literals from rest_framework import serializers -import models +from . import models class ProxyLogSerializer(serializers.ModelSerializer): diff --git a/apps/perms/serializers.py b/apps/perms/serializers.py index f630d5f0d..f19a64d9a 100644 --- a/apps/perms/serializers.py +++ b/apps/perms/serializers.py @@ -1,14 +1,4 @@ # -*- coding: utf-8 -*- # -from rest_framework import serializers - -class TerminalHeatbeatSerializer(serializers.ModelSerializer): - class Meta: - model = TerminalHeatbeat - fields = ['terminal'] - - -if __name__ == '__main__': - pass diff --git a/apps/terminal/api.py b/apps/terminal/api.py index d055781c6..a0bda4e55 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -18,6 +18,7 @@ class TerminalCreateListApi(ListCreateAPIView): def post(self, request, *args, **kwargs): name = unsign(request.data.get('name', '')) + print(name) if name: terminal = get_object_or_none(Terminal, name=name) if terminal: