From 749b9c4429d6e4fa745ecd0c2db83919d6a43637 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 1 Jul 2015 17:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEID=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb | 2 +-
 app/models/project.rb               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index fbfdf24c2..a01bba913 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -34,7 +34,7 @@ class AdminController < ApplicationController
   def projects
     @status = params[:status] || 1
 
-    scope = Project.status(@status).order('lft')
+    scope = Project.status(@status).order('id asc')
     scope = scope.like(params[:name]) if params[:name].present?
     @projects = scope.where(project_type: Project::ProjectType_project).all
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 49ed2d0ee..f201e6e3c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -839,7 +839,7 @@ class Project < ActiveRecord::Base
   # Yields the given block for each project with its level in the tree
   def self.project_tree(projects, &block)
     ancestors = []
-    projects.sort_by(&:lft).each do |project|
+    projects.sort_by(&:id).each do |project|
       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
         ancestors.pop
       end