Browse Source

添加排序及部分修改

tags/v1
sylor_huang@126.com 6 years ago
parent
commit
4b3f45bcce
2 changed files with 5 additions and 3 deletions
  1. +3
    -3
      app/controllers/projects_controller.rb
  2. +2
    -0
      app/services/projects/fork_service.rb

+ 3
- 3
app/controllers/projects_controller.rb View File

@@ -83,17 +83,17 @@ class ProjectsController < ApplicationController
end

def watch_users
watchers = @project.watchers.includes(:user).distinct
watchers = @project.watchers.includes(:user).order("watchers.created_at asc").distinct
@watchers = paginate(watchers)
end

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)
end

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)
end



+ 2
- 0
app/services/projects/fork_service.rb View File

@@ -27,6 +27,8 @@ class Projects::ForkService < ApplicationService

@project.update_column('forked_count', @project&.forked_count.to_i + 1)
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
end


Loading…
Cancel
Save