修改了自定义关系的bug

Pupil59 · May 20, 2020 · e837cc8 · e837cc8
1 parent 963e301
commit e837cc8
Show file tree

Hide file tree

Showing 5 changed files with 226 additions and 130 deletions.
diff --git a/textMark/.idea/workspace.xml b/textMark/.idea/workspace.xml
diff --git a/textMark/common/migrations/0003_merge_20200520_1445.py b/textMark/common/migrations/0003_merge_20200520_1445.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.5 on 2020-05-20 06:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0002_reltype'),
+        ('common', '0002_auto_20200511_2155'),
+    ]
+
+    operations = [
+    ]
diff --git a/textMark/db.sqlite3 b/textMark/db.sqlite3
diff --git a/textMark/project/relation.py b/textMark/project/relation.py
@@ -208,15 +208,14 @@ def addtype(request):
         })
 
     for reltype in types:
-
-        if info['name'] == reltype.name:
-            username = big_user.objects.get(id=uid)
+        if info['name'] == reltype['name']:
+            username = big_user.objects.get(id=uid).name
             return JsonResponse({
                 'ret': 1,
                 'msg': f'关系名在项目中已经存在，添加者为{username}'
             })
 
-    record = Entity.objects.create(name=info['name'],
+    record = RelType.objects.create(name=info['name'],
                                    project_id=pid,
                                    user_id=uid)