From 7f2f2c5d40dbec858f45027f7189644598f8ef4c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 14:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb         |  3 ++-
 app/views/layouts/_user_projects.html.erb   | 11 +++++++++++
 app/views/layouts/new_base_user.html.erb    |  9 ++-------
 app/views/users/user_projects4show.html.erb | 16 ----------------
 app/views/users/user_projects4show.js.erb   |  1 +
 public/javascripts/new_user.js              |  2 +-
 6 files changed, 17 insertions(+), 25 deletions(-)
 create mode 100644 app/views/layouts/_user_projects.html.erb
 delete mode 100644 app/views/users/user_projects4show.html.erb
 create mode 100644 app/views/users/user_projects4show.js.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6bdd3d6fc..2af2b9c42 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -481,7 +481,8 @@ class UsersController < ApplicationController
 
   #显示更多用户项目
   def user_projects4show
-
+    @page = params[:page].to_i + 1
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
 
   def user_course_activities
diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
new file mode 100644
index 000000000..864b6888c
--- /dev/null
+++ b/app/views/layouts/_user_projects.html.erb
@@ -0,0 +1,11 @@
+<% projects.each do |project|%>
+    <li class="homepageLeftMenuCoursesLine">
+      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey"%>
+    </li>
+<% end %>
+<% if projects.size == 5%>
+    <li class="homepageLeftMenuMore" id="user_show_more_project">
+      <input type="hidden" value="<%= page%>" id="project_page_num">
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_project('<%=  user_projects4show_user_path(user.id)%>');"></a>
+    </li>
+<% end%>
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 15af50332..4d85ef1b3 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -113,13 +113,8 @@
         </div>
         <div class="homepageLeftMenuCourses">
           <ul>
-            <%# projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
-            <%#= render :partial => 'layouts/user_item', :locals => {:items => courses,:is_course => false} %>
-            <%# if projects.size == 5%>
-                <!--li class="homepageLeftMenuMore" id="user_show_more_project">
-                  <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_project();"></a>
-                </li-->
-            <%# end%>
+            <% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
+            <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
diff --git a/app/views/users/user_projects4show.html.erb b/app/views/users/user_projects4show.html.erb
deleted file mode 100644
index 3c709bd5d..000000000
--- a/app/views/users/user_projects4show.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% for item in @list %>
-<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>" data-time="<%= item.updated_on %>">
-  <div class="courses_list_pic fl ml10 mr10">
-    <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>item.id, :host=>Setting.host_name) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %></a>
-  </div>
-  <span class="fl" style="width:260px;">
-    <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>item.id, :host=>Setting.host_name) %>" class="home_list_title c_blue02 fl mb10" title="<%= item.name %>"><%= item.name %></a>
-  </span>
-  <div class="fl c_dgrey">
-    <!--<p>项目评分：<a href="<%#= url_for(:controller => 'projects', :action => 'show_projects_score', :id => item.id,:host=>Setting.host_name) %>" data-remote="true"><%#= format( "%.2f" , project_scores(item) ).to_i %></a></p>-->
-    <p>项目评分：<a href="<%= url_for(:controller => 'projects', :action => 'show_projects_score', :id => item.id) %>" data-remote="true"><%= format( "%.2f" , project_scores(item) ).to_i %></a></p>
-    <p>发布缺陷：<a href="<%= url_for(:controller => 'issues', :action=>"index", :project_id=>item.id, :host=>Setting.host_name) %>"><%= item.issues.count %></a> <span class="ml10"></span>成员：<a href="<%= url_for(:controller => 'projects', :action=>"member", :id=>item.id, :host=>Setting.host_name) %>"><%= item.members.count %></a></p>
-  </div>
-  <div class="cl"></div>
-</div>
-<% end %>
diff --git a/app/views/users/user_projects4show.js.erb b/app/views/users/user_projects4show.js.erb
new file mode 100644
index 000000000..c19a79c81
--- /dev/null
+++ b/app/views/users/user_projects4show.js.erb
@@ -0,0 +1 @@
+$("#user_show_more_project").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_projects',:locals => {:projects => @projects,:user => @user, :page => @page} )%>");
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index ae94e48a7..e89b7374b 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -41,7 +41,7 @@ function show_more_course(url){
 function show_more_project(url){
     $.get(
         url,
-        { brief_introduction: $("#user_brief_introduction_edit").val() },
+        { page: $("#project_page_num").val() },
         function (data) {
 
         }