Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

.gitignore

@@ -66,6 +66,7 @@ vendor/bundle/
 /Users
 /files
 /public/images/avatars
+/public/cache_repository
 /public/files
 /workspace
 /log

app/models/laboratory_setting.rb

@@ -63,10 +63,11 @@ class LaboratorySetting < ApplicationRecord
       navbar: [
         { 'name' => '首页', 'link' => '/projects',        'hidden' => false },
         { 'name' => '课程', 'link' => '/courses',      'hidden' => false },
-        { 'name' => '项目', 'link' => '/projects',      'hidden' => false },
+        { 'name' => '项目', 'link' => '',      'hidden' => true },
         { 'name' => '数据', 'link' => '/datas', 'hidden' => false },
         { 'name' => '竞赛', 'link' => '/competitions',   'hidden' => false },
         { 'name' => '问吧', 'link' => '/forums',       'hidden' => false },
+        { 'name' => '开源社区', 'link' => '/projects',       'hidden' => false },
       ],
       footer: nil
     }

app/views/settings/show.json.jbuilder

@@ -19,6 +19,15 @@ json.setting do
   #   json.main_site current_laboratory.main_site?
   # end
 
+  nav_bar = default_setting.navbar
+  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
   json.nav_logo_url default_setting.nav_logo_url&.[](1..-1)
   json.login_logo_url default_setting.login_logo_url&.[](1..-1)
@@ -30,7 +39,7 @@ json.setting do
   json.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1)
   json.oj_banner_url default_setting.oj_banner_url&.[](1..-1)
 
-  json.navbar default_setting.navbar
+  json.navbar nav_bar
 
   json.footer default_setting.footer