Merge branch 'e-dialect:develop' into AT0405_me_like_author

e-dialect · Nov 9, 2023 · 39ed02f · 39ed02f
2 parents 21ab819 + 6dfcbb8
commit 39ed02f
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 96 deletions.
diff --git a/hinghwa-dict-backend/HinghwaDict/settings.py b/hinghwa-dict-backend/HinghwaDict/settings.py
@@ -35,6 +35,7 @@
 # Application definition
 
 INSTALLED_APPS = [
+    "simpleui",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
@@ -305,3 +306,7 @@
         "LOCATION": "pronunciation_ranking_cache_table",
     },
 }
+SIMPLEUI_LOGO = "https://hinghwa.cn/img/blue.7169aa26.svg"
+SIMPLEUI_HOME_INFO = False
+SIMPLEUI_HOME_ACTION = False
+SIMPLEUI_ANALYSIS = False
diff --git a/hinghwa-dict-backend/requirements.txt b/hinghwa-dict-backend/requirements.txt
@@ -15,3 +15,4 @@ python-environ==0.4.54
 numpy~=1.23.0
 requests~=2.28.1
 requests_toolbelt==0.10.1
+django-simpleui==2023.3.1
diff --git a/hinghwa-dict-backend/word/lists/view/manage_all_list.py b/hinghwa-dict-backend/word/lists/view/manage_all_list.py
@@ -22,6 +22,8 @@ def post(self, request):
         list_form = ListForm(body)
         if not list_form.is_valid():
             raise BadRequestException()
+        for id in body["words"]:
+            word = Word.objects.get(id=id)
         list = list_form.save(commit=False)
         list.createTime = timezone.now()
         list.updateTime = timezone.now()

diff --git a/tests/pronunciation-PN0102-200.apifox-cli.json b/tests/pronunciation-PN0102-200.apifox-cli.json
@@ -357,7 +357,6 @@
                     "pronunciation",
                     "pronunciation_uploaded",
                     "word",
-                    "listened",
                     "word_uploaded"
                   ],
                   "x-apifox-orders": [

diff --git a/tests/pronunciation-PN0205-200.apifox-cli.json b/tests/pronunciation-PN0205-200.apifox-cli.json
@@ -1623,29 +1623,19 @@
                       },
                       "title": "上传词语",
                       "description": "上传词语数量"
-                    },
-                    "listened": {
-                      "type": "integer",
-                      "mock": {
-                        "mock": "@integer"
-                      },
-                      "title": "听",
-                      "description": "上传语音被播放的量"
                     }
                   },
                   "required": [
                     "pronunciation",
                     "pronunciation_uploaded",
                     "word",
-                    "listened",
                     "word_uploaded"
                   ],
                   "x-apifox-orders": [
                     "pronunciation",
                     "pronunciation_uploaded",
                     "word",
-                    "word_uploaded",
-                    "listened"
+                    "word_uploaded"
                   ]
                 },
                 "notification": {