Update import

pull/530/head
ibuler 2016-10-20 19:01:57 +08:00
parent 67ecc108bd
commit 6b161d5971
5 changed files with 8 additions and 17 deletions

View File

@ -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}

View File

@ -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

View File

@ -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):

View File

@ -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

View File

@ -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: