From ffac8164f13056efd9bce826f7711fdb76386ec8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 15:55:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=92=8C=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=97=B6=E9=97=B4=E5=80=92=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb | 10 ++++++----
 app/views/admin/projects.html.erb   |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 01703f679..cec419eba 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -32,18 +32,20 @@ class AdminController < ApplicationController
   end
 
   def projects
+=begin
     @status = params[:status] || 1
 
-    scope = Project.status(@status).order('id asc')
+    scope = Project.status(@status)
     scope = scope.like(params[:name]) if params[:name].present?
-    @projects = scope.where(project_type: Project::ProjectType_project).all
-
+    @projects = scope.where(project_type: Project::ProjectType_project).reorder("created_on desc").all
+=end
+    @projects = Project.like(@name).order('created_on desc')
     render :action => "projects", :layout => false if request.xhr?
   end
 
   def courses
     @name = params[:name]
-    @courses = Course.like(@name)
+    @courses = Course.like(@name).order('created_at desc')
     respond_to do |format|
       format.html
     end
diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb
index 3f6ee36f0..d12e85856 100644
--- a/app/views/admin/projects.html.erb
+++ b/app/views/admin/projects.html.erb
@@ -45,8 +45,8 @@
     </tr>
     </thead>
     <tbody>
-    <% project_tree(@projects) do |project, level| %>
-        <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+    <% @projects.each do |project| %>
+        <tr class="<%= cycle("odd", "even") %>">
           <td style="text-align: center;">
             <%= project.id %>
           </td>