From cf25dc8dfd66f54dd424b1862841ae41e5732df9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 8 Sep 2016 15:00:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb    | 2 +-
 app/views/users/_project_list.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 73436395f..e0fa253b3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3518,7 +3518,7 @@ class UsersController < ApplicationController
 
     # 用户的所有项目
    # @my_projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
-    @my_projects = @user.projects.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_projects = @user.projects.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
     @my_projects_count = @my_projects.count
 
     #@my_joined_projects = @user.projects.visible.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
diff --git a/app/views/users/_project_list.html.erb b/app/views/users/_project_list.html.erb
index 4fa78f45d..9aeb39ab5 100644
--- a/app/views/users/_project_list.html.erb
+++ b/app/views/users/_project_list.html.erb
@@ -37,13 +37,13 @@
 <% else %>
   <% projects.each_with_index do |project, i| %>
     <div class="syllabus_courses_list <%= i > 4 ? 'none' : ''%>" style="cursor: default;">
-      <% allow_visit = User.current.member_of?(project) || User.current.admin? || project.is_public %>
+      <% allow_visit = User.current.member_of?(project) || User.current.admin? || project.is_public == 1 %>
       <div class="sy_courses_open">
         <span id="collect_project_icon_<%= project.id %>">
             <%=render :partial => 'collect_project', :locals => {:project => project} %>
         </span>
         <h3><%= link_to project.name, allow_visit ? project_path(project.id,:host=>Setting.host_name) : 'javascript:void(0)', :target => '_blank',
-                        :class => "new_project_title fl",:id => "show_project_#{project.id}", :title => (allow_visit ? "#{project.name}" : "私有班级不可访问") %></h3>
+                        :class => "new_project_title fl",:id => "show_project_#{project.id}", :title => (allow_visit ? "#{project.name}" : "私有项目不可访问") %></h3>
         <% unless project.is_public? %>
             <span class="syllabus_class_private fl ml10 mt3 syllabus_class_property">私有</span>
         <% end %>