scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-11 08:51:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8772 from andrej-scinote/aj_SCI_12232

Browse source 
Enable details tab on workspace [SCI-12232]
This commit is contained in:
andrej-scinote 2025-08-12 13:24:31 +02:00 • committed by GitHub
commit 05afcf988c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users/settings/teams_controller.rb
View file

@ -28,8 +28,6 @@ module Users
members members
) )
before_action :check_read_permissions, only: :show
before_action :check_create_team_permission, before_action :check_create_team_permission,
only: %i(new create) only: %i(new create)
@ -140,10 +138,6 @@ module Users
render_403 unless can_create_teams? render_403 unless can_create_teams?
end end
def check_read_permissions
render_403 unless can_read_team?(@team)
end
def load_user def load_user
@user = current_user @user = current_user
end end

4
app/controllers/users/settings/user_groups_controller.rb
View file

@ -7,8 +7,8 @@ module Users
before_action :set_breadcrumbs_items, only: %i(index show) before_action :set_breadcrumbs_items, only: %i(index show)
before_action :check_user_groups_enabled, except: :users before_action :check_user_groups_enabled, except: :users
before_action :load_user_group, except: %i(index unassigned_users actions_toolbar create) before_action :load_user_group, except: %i(index unassigned_users actions_toolbar create)
before_action :check_read_permissions, only: %i(index show unassigned_users actions_toolbar users) before_action :check_read_permissions, only: %i(users)
before_action :check_manage_permissions, except: %i(index show unassigned_users actions_toolbar users) before_action :check_manage_permissions, except: %i(users)
def index def index
respond_to do |format| respond_to do |format|

4
app/views/users/settings/teams/_header.html.erb
View file

@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<div class="flex items-center gap-4 p-2 mb-4 bg-white"> <div class="flex items-center gap-4 p-2 mb-4 bg-white">
<%= link_to t("users.settings.teams.navigation.details"), team_path(@team), class: "p-2.5 hover:no-underline #{ 'disabled' unless can_read_team?(@team) } #{ @active_tab == :details ? "text-sn-blue" : "text-sn-grey" }"%> <%= link_to t("users.settings.teams.navigation.details"), team_path(@team), class: "p-2.5 hover:no-underline #{ @active_tab == :details ? "text-sn-blue" : "text-sn-grey" }"%>
<%= link_to t("users.settings.teams.navigation.members"), members_users_settings_team_path(@team), class: "p-2.5 hover:no-underline #{ @active_tab == :members ? "text-sn-blue" : "text-sn-grey" }"%> <%= link_to t("users.settings.teams.navigation.members"), members_users_settings_team_path(@team), class: "p-2.5 hover:no-underline #{ @active_tab == :members ? "text-sn-blue" : "text-sn-grey" }"%>
<%= link_to t("users.settings.teams.navigation.groups"), users_settings_team_user_groups_path(@team), class: "p-2.5 hover:no-underline #{ 'disabled' unless can_read_team?(@team) } #{ @active_tab == :user_groups ? "text-sn-blue" : "text-sn-grey" }"%> <%= link_to t("users.settings.teams.navigation.groups"), users_settings_team_user_groups_path(@team), class: "p-2.5 hover:no-underline #{ 'disabled' unless can_manage_team?(@team) } #{ @active_tab == :user_groups ? "text-sn-blue" : "text-sn-grey" }"%>
</div> </div>