Merge branch 'develop' into trustie_server

2021-04-13 10:18:52 +08:00 · 2021-04-13 10:18:52 +08:00 · b3b0f75e9b
parent 5c8e561bd8 dcd4457cf5
commit b3b0f75e9b
1 changed files with 2 additions and 2 deletions
--- a/app/controllers/organizations/base_controller.rb
+++ b/app/controllers/organizations/base_controller.rb
@ -21,7 +21,7 @@ class Organizations::BaseController < ApplicationController
  end

  def team_not_found_condition
-    @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
+    !current_user&.admin? && @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
  end

  def user_mark