Merge branch 'dev_trustie' into dev_devops

2020-07-16 11:57:39 +08:00 · 2020-07-16 11:57:39 +08:00 · 5100c352fe
parent f4a54dbb38 ea702e8e50
commit 5100c352fe
1 changed files with 4 additions and 1 deletions
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@ -20,9 +20,12 @@ json.setting do
  # end

  nav_bar = default_setting.navbar
-  if current_user.present?
+  if User.current.logged?
    nav_bar[2]["link"] = "/users/#{current_user.login}"
    nav_bar[2]["hidden"] = false
+  else
+    nav_bar[2]["link"] = ""
+    nav_bar[2]["hidden"] = true
  end

  json.name default_setting.name