From a41b9d3a429f7bd2fc23ee5f0da49a6299fc0bd1 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 18 Jan 2017 09:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A4=BE=E5=8C=BA=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=A4=BE=E5=8C=BA=E7=9A=84=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=88=96=E7=8F=AD=E7=BA=A7=E5=88=97=E8=A1=A8=EF=BC=8C=E7=BD=91?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=E2=80=9C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE/=E8=AF=BE=E7=A8=8B-=E7=A1=AE=E5=AE=9E=E8=AE=A9?=
 =?UTF-8?q?=E5=88=9B=E6=96=B0=E6=9B=B4=E7=BE=8E=E5=A5=BD=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 ++
 app/helpers/application_helper.rb   | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2d34bcbd2..dc338a338 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4101,6 +4101,7 @@ class UsersController < ApplicationController
   end
 
   def user_courselist
+    @user_courselist = "课程"
     @order, @c_sort, @type, @list_type = 1, 2, 1, 1
 
     @my_syllabuses = @user.syllabuses
@@ -4284,6 +4285,7 @@ class UsersController < ApplicationController
   end
 
   def user_projectlist
+    @user_projectlist = "项目"
     @order, @c_sort, @type, @list_type = 1, 2, 1, 1
     #limit = 5
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 21a3dfff8..850cbca8f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1344,10 +1344,10 @@ module ApplicationHelper
       elsif @forum || params[:controller] == "forums"
         title << "问吧"
       elsif @user
-        if !@project_community.blank?
-          title << @project_community
-        elsif !@course_community.blank?
-          title << @course_community
+        if !@project_community.blank? || !@user_projectlist.blank?
+          title << "项目"
+        elsif !@course_community.blank? || !@user_courselist.blank?
+          title << "课程"
         elsif !@contest_community.blank?
           title << @contest_community
         elsif !@manage_issues.blank?