Merge branch 'develop' into trustie_server

2026-05-17 10:15:57 +08:00 · 2021-04-13 16:40:23 +08:00
parent b3b0f75e9b 07d11737e9
commit 879e45e106
3 changed files with 4 additions and 4 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -204,7 +204,7 @@ class User < Owner
  end

  def project_manager?(project)
-    project.managers.exists?(user: self) || self.admin?
+    project.manager?(self) || self.admin?
  end

  # 学号