From 00f032816cb2cfa3e56a5b4ee558d350cdc3bd07 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 13 Aug 2016 13:48:23 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/repositories_helper.rb                |  5 +++--
 app/views/repositories/_dir_list_content.html.erb | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index ef637d3ee..576bd4efd 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -47,9 +47,10 @@ module RepositoriesHelper
   end
 
   # 获取文件目录的最新动态
-  def get_trees_last_changes(project_id, rev, ent_name, g)
+  def get_trees_last_changes(gpid, rev, ent_name, g)
     begin
-      tree_changes = g.rep_last_changes(project_id, :rev => rev, :path => ent_name)
+      tree_changes = g.rep_last_changes(gpid, :rev => rev, :path => ent_name)
+      commits = g.commit(gpid, tree_changes.commit_id)
     rescue Exception => e
       puts e
     end
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 068ae0a1b..dd3f8bfa0 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -26,19 +26,19 @@
       </td>
       <div id="children_tree">
         <td class="tree-comments c_grey hidden">
-          <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
-            <%= (latest_changes.message) if latest_changes && latest_changes.message %>
+          <div class="hidden" title="<%= (latest_changes.message) if latest_changes %>">
+            <%= (latest_changes.message) if latest_changes %>
           </div>
         </td>
         <td class="tree-author c_grey">
-          <div class="hidden" title="<%= (latest_changes.author) if latest_changes && latest_changes.author %>">
-            <%= (latest_changes.author) if latest_changes && latest_changes.author %>
+          <div class="hidden" title="<%= (latest_changes.author) if latest_changes %>">
+            <%= (latest_changes.author_name) if latest_changes %>
           </div>
         </td>
         <td class="tree-age c_grey">
-          <div class="hidden" title="<%= format_time(latest_changes.time) %>">
+          <div class="hidden" title="<%= format_time(latest_changes.created_at) if latest_changes %>">
             <%# 为了转换UTC时间，时差8小时 %>
-            <%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>
+            <%= distance_of_time_in_words(latest_changes.created_at, Time.now + 8.hours) if latest_changes %>
           </div>
         </td>
       </div>

From 93f8ac31f1d1cdc619e6b42e2b094a6c8b7de809 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 13 Aug 2016 14:17:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E6=96=B0=E5=88=86=E9=A1=B5=E5=8F=8Aajax=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb          | 37 +++++++++++---------
 app/views/files/_project_list.html.erb       | 15 +++-----
 app/views/files/index.js.erb                 |  5 +--
 app/views/files/search_project.js.erb        |  9 ++---
 app/views/files/search_tag_attachment.js.erb |  4 +--
 5 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index a46e6e555..cd3870e9a 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -77,28 +77,25 @@ class FilesController < ApplicationController
       if params[:insite]
         if q == "%%"
           @result = []
-          @searched_attach = paginateHelper @result,10
+          # @searched_attach = paginateHelper @result,10
         else
           @result = find_public_attache q,sort
           @result = visable_attachemnts_insite @result,@course
-          @searched_attach = paginateHelper @result,10
+          # @searched_attach = paginateHelper @result,10
         end
       else
         @result = find_course_attache q,@course,sort
         @result = visable_attachemnts @result
-
-        @all_attachments = @result
-        @limit = 10
-        @feedback_count = @all_attachments.count
-        @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
-        @offset ||= @feedback_pages.offset
-        #@curse_attachments_all = @all_attachments[@offset, @limit]
-        @obj_attachments = paginateHelper @all_attachments,10
-
-        # @searched_attach = paginateHelper @result,10
-
+     # @searched_attach = paginateHelper @result,10
         @tag_list = get_course_tag_list @course
       end
+      @all_attachments = @result
+      @limit = 10
+      @feedback_count = @all_attachments.count
+      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+      @offset ||= @feedback_pages.offset
+      #@curse_attachments_all = @all_attachments[@offset, @limit]
+      @obj_attachments = paginateHelper @all_attachments,10
     #rescue Exception => e
     #  #render 'stores'
     #  redirect_to search_course_files_url
@@ -153,18 +150,26 @@ class FilesController < ApplicationController
       if params[:insite]
         if q == "%%"
           @project_attachment_result = []
-          @searched_attach = paginateHelper @project_attachment_result, 10
+          # @searched_attach = paginateHelper @project_attachment_result, 10
         else
           @project_attachment_result = find_public_attache q,sort
           @project_attachment_result = visable_attachemnts_insite  @project_attachment_result, @project
-          @searched_attach = paginateHelper @project_attachment_result, 10
+          # @searched_attach = paginateHelper @project_attachment_result, 10
         end
       else
         @project_attachment_result = find_project_attache q, @project,sort
         @project_attachment_result = visable_attachemnts @project_attachment_result
-        @searched_attach = paginateHelper @project_attachment_result,10
+        # @searched_attach = paginateHelper @project_attachment_result,10
         @tag_list = get_project_tag_list @project
       end
+
+      @all_attachments = @project_attachment_result
+      @limit = 10
+      @feedback_count = @all_attachments.count
+      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+      @offset ||= @feedback_pages.offset
+      #@curse_attachments_all = @all_attachments[@offset, @limit]
+      @obj_attachments = paginateHelper @all_attachments,10
       #rescue Exception => e
       #  #render 'stores'
       #  redirect_to search_course_files_url
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 36dc80a18..faf254015 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -66,17 +66,10 @@
     <% end %>
 <% end %>
 
-<% if project_attachments.count == 10%>
-    <% if params[:action] == 'search_project' %>
-        <!--<ul class="wlist">-->
-          <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>-->
-        <!--</ul>-->
-        <%=link_to "点击展开更多",  search_project_project_files_path({:project_id => project.id, :page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
-    <%else%>
-        <!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
-        <%=link_to "点击展开更多",  project_files_path(:project_id => project.id,:page => @page),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
-    <%end%>
-<% end%>
+<ul class="wlist">
+  <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
+</ul>
+
 
 
 
diff --git a/app/views/files/index.js.erb b/app/views/files/index.js.erb
index 134598bf7..982d19329 100644
--- a/app/views/files/index.js.erb
+++ b/app/views/files/index.js.erb
@@ -1,8 +1,9 @@
 <% if @course %>
-    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}) %>");
     $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% elsif @project %>
-    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/project_list', :locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments})%>");
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% elsif @org_subfield %>
     $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/org_subfield_list', :locals => {org_subfield:@org_subfield, all_attachments:@all_attachments, sort:@sort, order:@order, org_subfield_attachments:@obj_attachments})%>");
 <%end %>
\ No newline at end of file
diff --git a/app/views/files/search_project.js.erb b/app/views/files/search_project.js.erb
index 69752e0d9..f88438d57 100644
--- a/app/views/files/search_project.js.erb
+++ b/app/views/files/search_project.js.erb
@@ -1,7 +1,2 @@
-<% if (@obj_pages &&( @obj_pages.page > 1)) || (@feedback_pages && (@feedback_pages.page > 1)) %> //搜索的时候有时候是需要加载下一页，有时候是直接替换当前 #course_list。这个根据 page来判定
-    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/project_list',
-    :locals => {project: @project, all_attachments:@result, sort:@sort, order:@order, project_attachments:@searched_attach})%>");
-<% else %>
-    $("#course_list").html("<%= escape_javascript(render :partial => 'files/project_list',:locals => {project:@project, all_attachments:@result, sort:@sort, order:@order,project_attachments:@searched_attach})%>");
-    $("#attachment_count").html("<%= @project_attachment_result.count %>")
-<% end %>
\ No newline at end of file
+$("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>");
+$("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
diff --git a/app/views/files/search_tag_attachment.js.erb b/app/views/files/search_tag_attachment.js.erb
index 8d2b29fe9..dff75023b 100644
--- a/app/views/files/search_tag_attachment.js.erb
+++ b/app/views/files/search_tag_attachment.js.erb
@@ -2,6 +2,6 @@
     $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
     $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% else %>
-    $("#course_list").html("<%= escape_javascript(render :partial => 'project_list',:locals => {project:@project, all_attachments:@result_search_project, sort:@sort, order:@order, project_attachments:@searched_attach}) %>");
-    $("#attachment_count").html("<%= @result_search_project.count%>")
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% end %>

From 9003040d6af415a264ab35049ca18eb170f01cd6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 13 Aug 2016 14:42:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8A=A8=E6=80=81API=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/repositories_helper.rb                | 1 -
 app/views/repositories/_dir_list_content.html.erb | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 576bd4efd..bc5e8ee57 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -50,7 +50,6 @@ module RepositoriesHelper
   def get_trees_last_changes(gpid, rev, ent_name, g)
     begin
       tree_changes = g.rep_last_changes(gpid, :rev => rev, :path => ent_name)
-      commits = g.commit(gpid, tree_changes.commit_id)
     rescue Exception => e
       puts e
     end
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index dd3f8bfa0..a25d7a94c 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -31,14 +31,14 @@
           </div>
         </td>
         <td class="tree-author c_grey">
-          <div class="hidden" title="<%= (latest_changes.author) if latest_changes %>">
+          <div class="hidden" title="<%= (latest_changes.author_name) if latest_changes %>">
             <%= (latest_changes.author_name) if latest_changes %>
           </div>
         </td>
         <td class="tree-age c_grey">
-          <div class="hidden" title="<%= format_time(latest_changes.created_at) if latest_changes %>">
+          <div class="hidden" title="<%= format_time(latest_changes.time) if latest_changes %>">
             <%# 为了转换UTC时间，时差8小时 %>
-            <%= distance_of_time_in_words(latest_changes.created_at, Time.now + 8.hours) if latest_changes %>
+            <%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes %>
           </div>
         </td>
       </div>

From 0c6e1b2ccb3a434bd3fa3406f097c4118a554cc7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 13 Aug 2016 14:42:51 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=85=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/css/project.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 93f278269..95891d365 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -160,9 +160,9 @@ div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;}
 .repos_files ul:hover{ background:#ffffdd;}
 .repos_t_c li{ text-align:center;}
 .pic_stats{display:block; background:url(/images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
-.tree-age{width:10%; text-align:right;}
+.tree-age{width:15%; text-align:right;}
 .tree-author{width:10%; text-align:left;}
-.tree-comments{width:40%; text-align:left;}
+.tree-comments{width:35%; text-align:left;}
 
 /* 里程碑 */
 .roadmap_box{ background:#f8f8f8; width:648px; padding:10px; margin-top:5px; border:1px solid #ddd; color:#555;}