From 0dd474d5fc89456e6775f76b329ea75b641d7a76 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sun, 10 Mar 2024 14:11:18 +0800
Subject: [PATCH] feat: fix public profile page shows blank page bug

---
 object/application.go   |  5 +++--
 web/src/UserEditPage.js | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/object/application.go b/object/application.go
index 237e8f3f..6b74d2f5 100644
--- a/object/application.go
+++ b/object/application.go
@@ -529,11 +529,12 @@ func GetMaskedApplication(application *Application, userId string) *Application
 		application.OrganizationObj.PasswordSalt = "***"
 		application.OrganizationObj.InitScore = -1
 		application.OrganizationObj.EnableSoftDeletion = false
-		application.OrganizationObj.IsProfilePublic = false
 
 		if !isOrgUser {
 			application.OrganizationObj.MfaItems = nil
-			application.OrganizationObj.AccountItems = nil
+			if !application.OrganizationObj.IsProfilePublic {
+				application.OrganizationObj.AccountItems = nil
+			}
 		}
 	}
 
diff --git a/web/src/UserEditPage.js b/web/src/UserEditPage.js
index fe50c1d2..e27ba9a1 100644
--- a/web/src/UserEditPage.js
+++ b/web/src/UserEditPage.js
@@ -201,6 +201,10 @@ class UserEditPage extends React.Component {
   }
 
   updateUserField(key, value) {
+    if (this.props.account === null) {
+      return;
+    }
+
     value = this.parseUserField(key, value);
 
     const user = this.state.user;
@@ -989,7 +993,11 @@ class UserEditPage extends React.Component {
               <div style={{verticalAlign: "middle", marginBottom: 10}}>{`(${i18next.t("general:empty")})`}</div>
             </Col>
         }
-        <CropperDivModal disabled={disabled} tag={tag} setTitle={set} buttonText={`${title}...`} title={title} user={this.state.user} organization={this.getUserOrganization()} />
+        {
+          (this.props.account === null) ? null : (
+            <CropperDivModal disabled={disabled} tag={tag} setTitle={set} buttonText={`${title}...`} title={title} user={this.state.user} organization={this.getUserOrganization()} />
+          )
+        }
       </Col>
     );
   }