From 08e40c4a4e44e3409d51dbd4c73a93beb52cb6d0 Mon Sep 17 00:00:00 2001
From: Wen <wsm911120@126.com>
Date: Wed, 23 Apr 2014 21:26:37 +0800
Subject: [PATCH] bug fix

---
 app/views/welcome/course.html.erb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 03710844b..5fca9caf6 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -98,7 +98,17 @@
 	</div> 
 	<div class="main-content-bar">
 	<div class="welcome_left" >
-			<span class="font_welcome_trustie"><%= School.find(params[:school_id]).name %><br />
+			<span class="font_welcome_trustie">
+				<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
+				<% else %>
+					<% if params[:school_id].nil? %>
+						<%= School.find(User.current.user_extensions.school.id).name %>
+						<br />
+					<% else %>
+						<%= School.find(params[:school_id]).name %>
+						<br />
+					<% end %>
+				<% end %>
 				<%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
 	</div>
 	<div class="search-bar">