Display my team in admin also.

thape-cn · Nov 14, 2024 · f4b122c · f4b122c
1 parent ca27331
commit f4b122c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -4,15 +4,14 @@ class HomeController < ApplicationController
   before_action :set_breadcrumbs, if: -> { request.format.html? }
 
   def index
-    @first_level_user_job_roles = current_user&.user_job_roles
+    @first_level_user_job_roles = current_user&.user_job_roles || []
     @second_level_user_job_roles = []
 
     @first_level_user_job_roles.each do |ujr|
       ujr.managed_user_job_roles.each do |second_ujr|
         @second_level_user_job_roles << second_ujr if second_ujr.managed_user_job_roles.present?
       end
     end
-    redirect_to admin_root_path if current_user&.admin?
   end
 
   protected

diff --git a/app/views/layouts/sidebars/_admin.html.erb b/app/views/layouts/sidebars/_admin.html.erb
@@ -13,7 +13,10 @@
     <button class="sidebar-toggler" type="button" data-coreui-toggle="unfoldable" data-action="click->sidebar#click"></button>
   </div>
   <ul class="sidebar-nav" data-coreui="navigation" data-simplebar>
-    <%= nav_item(t('.dashboard'), root_path, 'free.svg#cil-speedometer') do %>
+    <%= nav_item(t('.dashboard'), admin_root_path, 'free.svg#cil-speedometer') do %>
+      <span class="badge bg-primary ms-auto">NEW</span>
+    <% end %>
+    <%= nav_item(t('.my_team'), root_path, 'free.svg#cil-speedometer') do %>
       <span class="badge bg-primary ms-auto">NEW</span>
     <% end %>
 

diff --git a/config/locales/views/layouts/sidebar/admin/en.yml b/config/locales/views/layouts/sidebar/admin/en.yml
@@ -5,4 +5,5 @@ en:
       admin:
         header: "Home"
         dashboard: "Admin dashboard"
+        my_team: "My team"
         account: "Account"
diff --git a/config/locales/views/layouts/sidebar/admin/zh-CN.yml b/config/locales/views/layouts/sidebar/admin/zh-CN.yml
@@ -5,4 +5,5 @@ zh-CN:
       admin:
         header: "首页"
         dashboard: "管理员仪表板"
+        my_team: "我的团队"
         account: "账号"