Browse Source

fix bug

tags/v3.0.2
jasder 5 years ago
parent
commit
cbc6f4e7d1
3 changed files with 2 additions and 4 deletions
  1. +2
    -2
      app/controllers/projects_controller.rb
  2. +0
    -1
      app/controllers/repositories_controller.rb
  3. +0
    -1
      app/services/projects/create_service.rb

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

@@ -11,7 +11,7 @@ class ProjectsController < ApplicationController
menu = []

menu.append(menu_hash_by_name("home"))
menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
menu.append(menu_hash_by_name("code"))
menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls")
menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops")
@@ -26,7 +26,7 @@ class ProjectsController < ApplicationController
scope = Projects::ListQuery.call(params)

# @projects = kaminari_paginate(scope)
@projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner)
@projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)

category_id = params[:category_id]
@total_count =


+ 0
- 1
app/controllers/repositories_controller.rb View File

@@ -18,7 +18,6 @@ class RepositoriesController < ApplicationController
# 新版项目详情
def detail
return render_not_found unless @project.has_menu_permission("code")
@user = current_user
@result = Repositories::DetailService.call(@owner, @repository, @user)
@project_fork_id = @project.try(:forked_from_project_id)


+ 0
- 1
app/services/projects/create_service.rb View File

@@ -46,7 +46,6 @@ class Projects::CreateService < ApplicationService
{
hidden: !repo_is_public,
user_id: params[:user_id],
website: params[:website],
identifier: params[:repository_name]
}
end


Loading…
Cancel
Save