fix: resolve conflict

apache · Nov 15, 2023 · a17ce16 · a17ce16
2 parents 175c042 + 498daa3
commit a17ce16
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
@@ -50,7 +50,10 @@ const AnswerLinks = () => {
             </a>
           </Col>
           <Col xs={6}>
-            <a href="https://answer.dev/docs" target="_blank" rel="noreferrer">
+            <a
+              href="https://github.com/apache/incubator-answer"
+              target="_blank"
+              rel="noreferrer">
               {t('github')}
             </a>
           </Col>

diff --git a/ui/src/pages/Admin/Login/index.tsx b/ui/src/pages/Admin/Login/index.tsx
@@ -150,6 +150,7 @@ const Index: FC = () => {
             setting.allow_email_domains.join('\n');
         }
         formMeta.login_required.value = setting.login_required;
+        formMeta.allow_password_login.value = setting.allow_password_login;
         setFormData({ ...formMeta });
       }
     });

diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
@@ -236,6 +236,9 @@ const Ask = () => {
     if (e.currentTarget.value.length >= 10) {
       querySimilarQuestions(e.currentTarget.value);
     }
+    if (e.currentTarget.value.length === 0) {
+      setSimilarQuestions([]);
+    }
   };
   const handleContentChange = (value: string) => {
     setFormData({