[FIX]一些筛选以及创建最大项目数量验证

[FIX]

app/controllers/organizations/base_controller.rb

@@ -27,4 +27,8 @@ class Organizations::BaseController < ApplicationController
   def user_mark
     params[:username] || params[:id]
   end
+
+  def project_mark
+    params[:repo_name] || params[:id]
+  end
 end

app/controllers/organizations/organizations_controller.rb

@@ -12,7 +12,8 @@ class Organizations::OrganizationsController < Organizations::BaseController
     else
       @organizations = Organization.with_visibility("common")
     end
-    @organizations = @organizations.includes(:organization_extension).order(id: :asc)
+    @organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present?
+    @organizations = @organizations.includes(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}")
     @organizations = kaminari_paginate(@organizations)
   end
 
@@ -82,4 +83,12 @@ class Organizations::OrganizationsController < Organizations::BaseController
     tip_exception("没有查看组织的权限") if org_limited_condition || org_privacy_condition
   end
 
+  def sort_by
+    params.fetch(:sort_by, "created_at")
+  end
+
+  def sort_direction
+    params.fetch(:sort_direction, "desc")
+  end
+
 end

app/controllers/organizations/team_projects_controller.rb

@@ -11,6 +11,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController
   end
 
   def create
+    tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
     ActiveRecord::Base.transaction do
       @team_project = TeamProject.build(@organization.id, @team.id, @operate_project.id)
       Gitea::Organization::TeamProject::CreateService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
@@ -21,8 +22,9 @@ class Organizations::TeamProjectsController < Organizations::BaseController
   end
 
   def destroy
+    tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
     ActiveRecord::Base.transaction do
-      @team_projects.destroy!
+      @team_project.destroy!
       Gitea::Organization::TeamProject::DeleteService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
       render_ok
     end
@@ -45,7 +47,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController
   end
 
   def load_operate_project
-    @operate_project = Project.find_by(name: params[:id]) || Project.find_by(identifier: params[:id])
+    @operate_project = Project.find_by(id: project_mark) || Project.find_by(identifier: project_mark)
     tip_exception("项目不存在") if @operate_project.nil?
   end