Commit 6b161d59 authored by ibuler's avatar ibuler

Update import

parent 67ecc108
...@@ -322,8 +322,8 @@ class Asset(models.Model): ...@@ -322,8 +322,8 @@ class Asset(models.Model):
created_by = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Created by')) 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')) 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')) 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')) comment = models.TextField(max_length=128, default='', blank=True, verbose_name=_('Comment'))
tags = models.ManyToManyField('Tag', verbose_name='标签集合', blank=True) tags = models.ManyToManyField('Tag', blank=True, verbose_name=_('Tags'))
def __unicode__(self): def __unicode__(self):
return '%(ip)s:%(port)s' % {'ip': self.ip, 'port': self.port} return '%(ip)s:%(port)s' % {'ip': self.ip, 'port': self.port}
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
# #
from __future__ import absolute_import, unicode_literals
from rest_framework import generics from rest_framework import generics
import serializers from . import models, serializers
import models
from .hands import IsSuperUserOrTerminalUser, Terminal from .hands import IsSuperUserOrTerminalUser, Terminal
......
#!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from __future__ import absolute_import, unicode_literals
from rest_framework import serializers from rest_framework import serializers
import models from . import models
class ProxyLogSerializer(serializers.ModelSerializer): class ProxyLogSerializer(serializers.ModelSerializer):
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from rest_framework import serializers
class TerminalHeatbeatSerializer(serializers.ModelSerializer):
class Meta:
model = TerminalHeatbeat
fields = ['terminal']
if __name__ == '__main__':
pass
...@@ -18,6 +18,7 @@ class TerminalCreateListApi(ListCreateAPIView): ...@@ -18,6 +18,7 @@ class TerminalCreateListApi(ListCreateAPIView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
name = unsign(request.data.get('name', '')) name = unsign(request.data.get('name', ''))
print(name)
if name: if name:
terminal = get_object_or_none(Terminal, name=name) terminal = get_object_or_none(Terminal, name=name)
if terminal: if terminal:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment