deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Deprecate code for Project. Use title and path

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-23 21:11:09 +03:00
parent ab9d023651
commit c50ec72b52
22 changed files with 79 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/projects_controller.rb
View file

@ -5,7 +5,7 @@ class Admin::ProjectsController < AdminController
@projects = Project.scoped
@projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present?
@projects = @projects.search(params[:name]) if params[:name].present?
@projects = @projects.includes(:namespace).order("namespaces.code, projects.name ASC").page(params[:page]).per(20)
@projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
end
def show

2
app/controllers/application_controller.rb
View file

@ -66,7 +66,7 @@ class ApplicationController < ActionController::Base
id = params[:project_id] || params[:id]
id = id.split("/") if id.include?("/")
@project ||= current_user.projects.find_by_code(id)
@project ||= current_user.projects.find_by_path(id)
@project || render_404
end