添加排序及部分修改
This commit is contained in:
parent
dbc0d3eabb
commit
4b3f45bcce
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,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
|
||||||
|
|
Loading…
Reference in New Issue