From a5c792b78275a88a9f2d5c80861c48bde3430722 Mon Sep 17 00:00:00 2001
From: tianqilu <1336601986@qq.com>
Date: Sun, 14 May 2023 21:10:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/userpage_get.html | 12 ++++++------
 app/user_service.py             |  7 +++----
 2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 6d43e36..0ee66dc 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -37,16 +37,16 @@
 <body>
 <div class="container-fluid">
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
-<<<<<<< HEAD
         <a class="btn btn-secondary" href="/logout" role="button">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button">重设密码</a>
     </p>
-    {% if flashed_messages != "" %}
-        <div class="alert alert-warning" role="alert" id="warn_info">{{ flashed_messages|safe }}</div>
+    {% if flashed_messages != [] %}
+        <div class="alert alert-warning" role="alert" id="warn_info">
+            {{ flashed_messages|safe }}
+        </div>
     {% endif %}
 
-=======
->>>>>>> d9f6df7fbe585395a19b9a08c411d841b6b89fd4
+
 
         {% if username ==  admin_name %}
         <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
@@ -123,7 +123,7 @@
 
     {% if d_len > 0 %}
         <p>
-            <b>我的生词簿</b> 
+            <b>我的生词簿</b>
             <label for="move_dynamiclly">
                 <input type="checkbox" name="move_dynamiclly" id="move_dynamiclly" checked>
                 允许动态调整顺序
diff --git a/app/user_service.py b/app/user_service.py
index 0338ebe..2fc1539 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -102,8 +102,7 @@ def deleteword(username, word):
     '''
     user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
     pickle_idea2.deleteRecord(user_freq_record, word)
-    # 模板userpage_get.html中删除单词是异步执行，而flash的信息后续是同步执行的，所以注释这段代码；同时如果这里使用flash但不提取信息，则会影响 signup.html的显示。bug复现：删除单词后，点击退出，点击注册，注册页面就会出现提示信息
-    # flash(f'{word} is no longer in your word list.')
+    flash(f'{word} is no longer in your word list.')
     return "success"
 
 
@@ -151,7 +150,7 @@ def userpage(username):
                                admin_name=ADMIN_NAME,
                                username=username,
                                session=session,
-                               # flashed_messages=get_flashed_messages(), 仅有删除单词的时候使用到flash，而删除单词是异步执行，这里的信息提示是同步执行，所以就没有存在的必要了
+                               flashed_messages=get_flashed_messages(),
                                today_article=today_article,
                                result_of_generate_article=result_of_generate_article,
                                d_len=len(d),
@@ -193,7 +192,7 @@ def get_flashed_messages_if_any():
     在用户界面显示黄色提示信息
     :return: 包含HTML标签的提示信息
     '''
-    messages = get_flashed_messages()
+    messages = get_flashed_messages
     s = ''
     for message in messages:
         s += message
