From 69869a05c917a968f7ff57333bf1cef1a8a8e4d6 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Wed, 16 Oct 2013 10:58:21 +0800
Subject: [PATCH] reverse projects list, add explain to role.

---
 app/controllers/users_controller.rb       | 9 +++++----
 app/views/users/_my_course.html.erb       | 4 ++--
 app/views/users/_my_joinedcourse.html.erb | 4 ++--
 app/views/users/user_courses.html.erb     | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cdfda4d9c..01347a571 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -150,9 +150,10 @@ class UsersController < ApplicationController
   
   # added by fq
   def user_courses   
+    @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current)).reverse 
     case params[:type]      
-      when "2"        
-      @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
+    when "2"        
+      #@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
       @memberships = []
       @membership.each do |membership|
         if  membership.project.project_type == 1
@@ -162,7 +163,7 @@ class UsersController < ApplicationController
     @state = 2
          
     when "1"
-      @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
+      #@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
       @memberships = []
       @membership.each do |membership|
         if membership.project.project_type == 1
@@ -177,7 +178,7 @@ class UsersController < ApplicationController
       @state = 1
         
     else
-      @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
+      #@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
       @memberships = []
       @membership.each do |membership|
         if membership.project.project_type == 1
diff --git a/app/views/users/_my_course.html.erb b/app/views/users/_my_course.html.erb
index 6a461c6ce..c06abe4b0 100644
--- a/app/views/users/_my_course.html.erb
+++ b/app/views/users/_my_course.html.erb
@@ -46,8 +46,8 @@
 						</tr>
 						<tr>
 							<td align="left"><span class="font_lighter"> <%= format_time(membership.created_on) %></span></td><!-- modified by ming -->
-							<td  align="right" > 
-								
+							<td  align="right" style="font-size: 13px"> 
+							课程角色：	
 							<% if membership.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
 							老师
 							<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb
index ae5735b0c..825fa5a8f 100644
--- a/app/views/users/_my_joinedcourse.html.erb
+++ b/app/views/users/_my_joinedcourse.html.erb
@@ -45,8 +45,8 @@
 						</tr>
 						<tr>
 							<td align="left"><span class="font_lighter"> <%= format_time(membership.created_on) %></span></td><!-- modified by ming -->
-							<td  align="right" > 
-								
+							<td  align="right" style="font-size: 13px"> 
+							课程角色：	
 							<% if membership.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
 							老师
 							<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
diff --git a/app/views/users/user_courses.html.erb b/app/views/users/user_courses.html.erb
index 46f10d378..f056cabe3 100644
--- a/app/views/users/user_courses.html.erb
+++ b/app/views/users/user_courses.html.erb
@@ -1,7 +1,7 @@
 <!-- added by fq -->
 <!--huang-->
 	<% if @user.user_extensions.identity == 0  %>	<!-- for teacher-->
-	<%= render :partial => 'my_course' %>
+		<%= render :partial => 'my_course' %>
 	<% else %> <!--for student-->
     <%= render :partial => 'my_joinedcourse' %>
 	<% end %>