github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-15 23:08:20 +00:00
Code Issues Projects Releases Wiki Activity

feat(application): 迁移old_application到new_application

Browse Source
This commit is contained in:
Bai
2020-10-21 11:31:33 +08:00
committed by 老广
parent 6ffba739f2
commit 1c551b4fe8
4 changed files with 108 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/applications/serializers/application.py
View File

@@ -32,9 +32,6 @@ class ApplicationSerializer(BulkOrgResourceModelSerializer):
if hasattr(self, 'initial_data'):
app_type = self.initial_data.get('type')
attrs_data = self.initial_data.get('attrs')
if self.instance:
app_type = self.instance.type
attrs_data = self.instance.attrs
if not app_type:
return
attrs_cls = models.Category.get_type_serializer_cls(app_type)
@@ -52,8 +49,10 @@ class ApplicationSerializer(BulkOrgResourceModelSerializer):
return instance
def update(self, instance, validated_data):
attrs = validated_data.pop('attrs', {})
new_attrs = validated_data.pop('attrs', {})
instance = super().update(instance, validated_data)
attrs = instance.attrs
attrs.update(new_attrs)
instance.attrs = attrs
instance.save()
return instance

2
apps/applications/serializers/remote_app.py
View File

@@ -15,7 +15,7 @@ from ..models import RemoteApp
class RemoteAppAttrsSerializer(serializers.Serializer):
asset = serializers.PrimaryKeyRelatedField(queryset=Asset.objects, label=_("Assets"))
asset = serializers.CharField(max_length=36, label=_('Assets'))
path = serializers.CharField(label=_('Remote App path'))