Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron

FFIB 9 months ago
parent
commit
d1364a21c0
2 changed files with 2 additions and 3 deletions
  1. 1 0
      api/lensman/contract_mp_views.py
  2. 1 3
      apps/contract/models.py

+ 1 - 0
api/lensman/contract_mp_views.py

@@ -1,4 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2
+import json
2 3
 
3 4
 from django.conf import settings
4 5
 from django_logit import logit

+ 1 - 3
apps/contract/models.py

@@ -1,6 +1,4 @@
1 1
 # -*- coding: utf-8 -*-
2
-import json
3
-
4 2
 from django.db import models
5 3
 from django.utils.translation import ugettext_lazy as _
6 4
 from django_models_ext import BaseModelMixin, upload_file_path, upload_path
@@ -83,7 +81,7 @@ class LensmanContributionContractInfo(BaseModelMixin):
83 81
             'lensman_id': self.lensman_id,
84 82
             'activity_id': self.activity_id,
85 83
             'contribution_id': self.contribution_id,
86
-            'contract_content_fields': json.loads(self.contract_content_fields) if self.contract_content_fields else '',
84
+            'contract_content_fields': self.contract_content_fields,
87 85
             'contract_file_url': self.contract_file_url,
88 86
             'contract_status': self.contract_status,
89 87
             'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),