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

添加排序及部分修改

This commit is contained in:
sylor_huang@126.com 2020-05-15 18:00:34 +08:00
parent dbc0d3eabb
commit 4b3f45bcce
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/projects_controller.rb
View File

@ -83,17 +83,17 @@ class ProjectsController < ApplicationController
end end
def watch_users def watch_users
watchers = @project.watchers.includes(:user).distinct watchers = @project.watchers.includes(:user).order("watchers.created_at asc").distinct
@watchers = paginate(watchers) @watchers = paginate(watchers)
end end
def praise_users def praise_users
praises = @project.praise_treads.includes(:user).distinct praises = @project.praise_treads.includes(:user).order("praise_treads.created_at asc").distinct
@praises = paginate(praises) @praises = paginate(praises)
end end
def fork_users def fork_users
fork_users = @project.fork_users.includes(:user, :project).distinct fork_users = @project.fork_users.includes(:user, :project).order("fork_users.created_at asc").distinct
@fork_users = paginate(fork_users) @fork_users = paginate(fork_users)
end end

2
app/services/projects/fork_service.rb
View File

@ -28,6 +28,8 @@ class Projects::ForkService < ApplicationService
@project.update_column('forked_count', @project&.forked_count.to_i + 1) @project.update_column('forked_count', @project&.forked_count.to_i + 1)
new_repository.update_column('url', result['clone_url']) if result new_repository.update_column('url', result['clone_url']) if result
ForkUser.create(project_id: @project.id, fork_project_id: clone_project.id, user_id: clone_project.user_id)
clone_project clone_project
end end
rescue => e rescue => e