diff --git a/apps/applications/api.py b/apps/applications/api.py index 508748ae6..5ba5d82bb 100644 --- a/apps/applications/api.py +++ b/apps/applications/api.py @@ -27,7 +27,7 @@ class TerminalRegisterView(ListCreateAPIView): serializer = self.serializer_class(data={'name': name, 'remote_addr': remote_addr}) if get_object_or_none(Terminal, name=name): - return Response({'msg': 'Registed, Need admin active it'}, status=200) + return Response({'msg': 'Already register, Need administrator active it'}, status=200) if serializer.is_valid(): terminal = serializer.save() @@ -54,6 +54,12 @@ class TerminalViewSet(viewsets.ModelViewSet): def create(self, request, *args, **kwargs): return Response({'msg': 'Use register view except that'}, status=404) + def destroy(self, request, *args, **kwargs): + instance = self.get_object() + if instance.user is not None: + instance.user.delete() + return super(TerminalViewSet, self).destroy(request, *args, **kwargs) + class TerminalHeatbeatViewSet(viewsets.ModelViewSet): queryset = TerminalHeatbeat.objects.all() diff --git a/apps/applications/templates/applications/terminal_update.html b/apps/applications/templates/applications/terminal_update.html index 87542ecd3..718ceda94 100644 --- a/apps/applications/templates/applications/terminal_update.html +++ b/apps/applications/templates/applications/terminal_update.html @@ -32,18 +32,12 @@ {% csrf_token %}

{% trans 'Info' %}

{{ form.name|bootstrap_horizontal }} - {{ form.ip|bootstrap_horizontal }} + {{ form.remote_addr|bootstrap_horizontal }} {{ form.type|bootstrap_horizontal }} {{ form.url|bootstrap_horizontal }}

{% trans 'Other' %}

-
- -
- {{ form.is_active}} -
-
{{ form.comment|bootstrap_horizontal }}
diff --git a/apps/assets/serializers.py b/apps/assets/serializers.py index 8ed489a48..87fec5767 100644 --- a/apps/assets/serializers.py +++ b/apps/assets/serializers.py @@ -13,7 +13,7 @@ class AssetGroupSerializer(BulkSerializerMixin, serializers.ModelSerializer): class Meta: model = AssetGroup list_serializer_class = BulkListSerializer - fields = ['id', 'name', 'comment', 'assets_amount'] + fields = ['id', 'name', 'comment', 'assets_amount', 'assets'] @staticmethod def get_assets_amount(obj): @@ -68,6 +68,7 @@ class TagSerializer(BulkSerializerMixin, serializers.ModelSerializer): class Meta: model = Tag list_serializer_class = BulkListSerializer + fields = '__all__' @staticmethod def get_assets_amount(obj): @@ -79,6 +80,7 @@ class AdminUserSerializer(serializers.ModelSerializer): class Meta: model = AdminUser + fields = '__all__' def get_field_names(self, declared_fields, info): fields = super(AdminUserSerializer, self).get_field_names(declared_fields, info) @@ -127,7 +129,7 @@ class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer): class Meta(object): model = Asset list_serializer_class = BulkListSerializer - fields = ['__all__'] + fields = '__all__' @staticmethod def get_hardware(obj): @@ -170,6 +172,7 @@ class IDCSerializer(BulkSerializerMixin, serializers.ModelSerializer): class Meta: model = IDC + fields = '__all__' @staticmethod def get_assets_amount(obj): diff --git a/apps/users/models/group.py b/apps/users/models/group.py index 33ec5d4fe..e73942d25 100644 --- a/apps/users/models/group.py +++ b/apps/users/models/group.py @@ -16,18 +16,13 @@ __all__ = ['UserGroup'] class UserGroup(NoDeleteModelMixin, Group): comment = models.TextField(blank=True, verbose_name=_('Comment')) - date_created = models.DateTimeField(auto_now_add=True) + date_created = models.DateTimeField(auto_now_add=True, null=True) created_by = models.CharField(max_length=100) def __unicode__(self): return self.name - def has_member(self, user): - if user in self.users.all(): - return True - return False - - def delete(self): + def delete(self, using=None, keep_parents=False): if self.name != 'Default': self.users.clear() return super(UserGroup, self).delete() diff --git a/apps/users/serializers.py b/apps/users/serializers.py index 92839e311..880d3b21e 100644 --- a/apps/users/serializers.py +++ b/apps/users/serializers.py @@ -56,6 +56,7 @@ class UserGroupSerializer(BulkSerializerMixin, serializers.ModelSerializer): class Meta: model = UserGroup list_serializer_class = BulkListSerializer + fields = '__all__' @staticmethod def get_user_amount(obj): diff --git a/apps/users/templates/users/_user.html b/apps/users/templates/users/_user.html index a9df818d4..f119821b3 100644 --- a/apps/users/templates/users/_user.html +++ b/apps/users/templates/users/_user.html @@ -27,7 +27,6 @@ {{ form.date_expired.errors }}
- {{ form.date_expired|bootstrap_horizontal }}
diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html index ec9162f05..ba6128124 100644 --- a/apps/users/templates/users/user_detail.html +++ b/apps/users/templates/users/user_detail.html @@ -346,7 +346,7 @@ $(document).ready(function() { }); }).on('click', '#btn_reset_pk', function() { function doReset() { - var the_url = '{% url "api-users:user-reset-pk" pk=user.id %}'; + var the_url = '{% url "api-users:user-public-key-reset" pk=user.id %}'; var body = {}; var success = function() { var msg = "{% trans 'The reset-ssh-public-key E-mail has been sent successfully. Please inform the user to update his new ssh public key.' %}"; @@ -372,7 +372,7 @@ $(document).ready(function() { }).on('click', '#btn_user_update_pk', function(){ var $this = $(this); var pk = $('#txt_pk').val(); - var the_url = '{% url "api-users:user-update-pk" pk=user.id %}'; + var the_url = '{% url "api-users:user-public-key-reset" pk=user.id %}'; var body = {'_public_key': pk}; var success = function() { $('#txt_pk').val('');