floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

This commit is contained in:
Jasder 2020-07-07 16:08:18 +08:00
parent df6bddfb8d 1bb8060b37
commit dbafd32d0b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/repositories_controller.rb
View File

@ -53,6 +53,8 @@ class RepositoriesController < ApplicationController
@project_owner = @project.owner @project_owner = @project.owner
@hash_commit = Gitea::Repository::Commits::ListService.new(@project_owner.login, @project.identifier, @hash_commit = Gitea::Repository::Commits::ListService.new(@project_owner.login, @project.identifier,
sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
Rails.logger.info("#####################_______hash_commit______############{@hash_commit}")
Rails.logger.info("#####################_______hash_commit_size______############{@hash_commit.size}")
end end
def commit def commit

4
app/models/project.rb
View File

@ -165,4 +165,8 @@ class Project < ApplicationRecord
Project.find_by(id: self.forked_from_project_id) Project.find_by(id: self.forked_from_project_id)
end end
def self.members_projects(member_user_id)
joins(:members).where(members: { user_id: member_user_id})
end
end end

11
app/queries/projects/list_my_query.rb
View File

@ -17,16 +17,15 @@ class Projects::ListMyQuery < ApplicationQuery
projects = Project.visible projects = Project.visible
end end
if params[:is_public].present? && params[:is_public] == "private" if params[:is_public].present?
projects = projects.is_private.joins(:members).where(members: { user_id: user.id }) projects = projects.is_private.members_projects(user.id) if params[:is_public].to_s == "private"
else projects = projects.visible.members_projects(user.id) if params[:is_public].to_s == "public"
projects = projects.visible.joins(:members).where(members: { user_id: user.id })
end end
if params[:category].blank? if params[:category].blank?
projects = projects.joins(:members).where(members: { user_id: user.id }) projects = projects.members_projects(user.id)
elsif params[:category].to_s == "join" elsif params[:category].to_s == "join"
projects = projects.where.not(user_id: user.id).joins(:members).where(members: { user_id: user.id }) projects = projects.where.not(user_id: user.id).members_projects(user.id)
elsif params[:category].to_s == "manage" elsif params[:category].to_s == "manage"
projects = projects.where(user_id: user.id) projects = projects.where(user_id: user.id)
elsif params[:category].to_s == "watched" #我关注的 elsif params[:category].to_s == "watched" #我关注的