From 54571048d63742b021f6ccafebe4031ed589cf47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E4=BA=8C=E7=8C=9B?= Date: Sat, 14 Dec 2019 14:32:08 +0800 Subject: [PATCH] A api update --- spug_api/apps/app/models.py | 5 +++++ spug_api/apps/app/views.py | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/spug_api/apps/app/models.py b/spug_api/apps/app/models.py index aa6a2ba..4febcfb 100644 --- a/spug_api/apps/app/models.py +++ b/spug_api/apps/app/models.py @@ -75,6 +75,11 @@ class AppExtend2(models.Model, ModelMixin): app = models.OneToOneField(App, primary_key=True, on_delete=models.CASCADE) actions = models.TextField() + def to_dict(self, *args, **kwargs): + tmp = super().to_dict(*args, **kwargs) + tmp['actions'] = json.loads(self.actions) + return tmp + def __repr__(self): return '' % self.app_id diff --git a/spug_api/apps/app/views.py b/spug_api/apps/app/views.py index e7ca592..158465d 100644 --- a/spug_api/apps/app/views.py +++ b/spug_api/apps/app/views.py @@ -50,8 +50,13 @@ class AppView(View): ).parse(request.body) if error: return json_response(error=error) - app = App.objects.create(created_by=request.user, **form) - AppExtend2.objects.create(app=app, actions=json.dumps(extend_form.actions)) + extend_form.actions = json.dumps(extend_form.actions) + if form.id: + App.objects.filter(pk=form.id).update(**form) + AppExtend2.objects.filter(app_id=form.id).update(**extend_form) + else: + app = App.objects.create(created_by=request.user, **form) + AppExtend2.objects.create(app=app, **extend_form.actions) return json_response(error=error)