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 'standalone_develop' into trustie_server

This commit is contained in:
xxq250 2024-08-29 16:21:18 +08:00
parent 04f8bcb1b0 39f234cc06
commit f80a33c9df
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/services/users/project_service.rb
View File

@ -20,6 +20,7 @@ class Users::ProjectService
projects = category_filter(projects) projects = category_filter(projects)
projects = status_filter(projects) projects = status_filter(projects)
projects = by_project_topic(projects)
custom_sort(projects, params[:sort_by], params[:sort_direction]) custom_sort(projects, params[:sort_by], params[:sort_direction])
end end
@ -45,6 +46,14 @@ class Users::ProjectService
end end
end end
def by_project_topic(items)
if params[:topic_name].present?
items.with_project_topic_name(params[:topic_name].to_s.split(","))
else
items.with_project_topic(params[:topic_id])
end
end
def self_or_admin? def self_or_admin?
User.current.id == user.id || User.current.admin? User.current.id == user.id || User.current.admin?
end end