From bf49f46b2217e6c7e21ba090ab13ca972c31f806 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Oct 2014 12:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=85=A5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=8A=A5=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb |  2 +-
 app/views/users/show.html.erb         | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 93626b86b..089960e76 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -26,7 +26,7 @@ class CoursesController < ApplicationController
   def join
     if User.current.logged?
       course = Course.find_by_id params[:object_id]
-      if course
+      unless course
         @state = 4
       else
         unless (allow_join(course) && User.current.member_of_course?(course))
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 3d2b7b0f0..fd0195833 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,11 +1,19 @@
 <% if User.current.id == @user.id %>
     <div class="menu-div">
       <div class="menu">
-        <span style="color: #000; font-weight: bold;"><%= "#{@user.name}的动态" %></span>
+        <span style="color: #000; font-weight: bold;">
+          <%= "#{@user.name}的动态" %>
+        </span>
         <ul><%#链接绑定在页面最下方的jQuery%>
-          <li mode='all' class="<%= "on" if @state.eql?(0) %>"><%= l :label_user_all_activity %></li>
-          <li mode='myself' class="<%= "on" if @state.eql?(1) %>"><%= l :label_user_activity_myself %></li>
-          <li mode='respond' class="<%= "on" if @state.eql?(2) %>"><%= l :label_user_all_respond %></li>
+          <li mode='all' class="<%= "on" if @state.eql?(0) %>">
+            <%= l :label_user_all_activity %>
+          </li>
+          <li mode='myself' class="<%= "on" if @state.eql?(1) %>">
+            <%= l :label_user_activity_myself %>
+          </li>
+          <li mode='respond' class="<%= "on" if @state.eql?(2) %>">
+            <%= l :label_user_all_respond %>
+          </li>
         </ul>
       </div>
       <script type="text/javascript">
@@ -28,6 +36,7 @@
     <% end %>
 <% end %>
 
+<%= render_flash_messages %>
 <% unless @state == 2 %>
     <% unless @activity.empty? %>
         <div id="activity">