From c1e780a0f84149d8a30bbf769e9a633a2fc166db Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Mon, 23 Jun 2014 18:48:57 +0800
Subject: [PATCH] yan

---
 app/controllers/projects_controller.rb     | 16 ++--------------
 app/views/bids/_bid_homework_show.html.erb |  5 +----
 app/views/welcome/index.html.erb           |  8 --------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 33adb3ac..c0c3ce76 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -361,22 +361,10 @@ class ProjectsController < ApplicationController
   #Added by young
   def homework
     @offset, @limit = api_offset_and_limit({:limit => 10})
-    @bids = @project.homeworks.order('deadline DESC')
+    @bids = @project.homeworks.order('deadline')
     @bids = @bids.like(params[:name]) if params[:name].present?
-    @bid_count = @bids.count
-    @bid_pages = Paginator.new @bid_count, @limit, params['page']
 
-    @offset ||= @bid_pages.reverse_offset
-    #@bids = @bids.offset(@offset).limit(@limit).all.reverse
-    unless @offset == 0
-      @bids = @bids.offset(@offset).limit(@limit).all.reverse
-    else
-      limit = @bid_count % @limit
-      if limit == 0
-        limit = 10
-      end
-      @bids = @bids.offset(@offset).limit(limit).all.reverse
-    end
+    @bids = paginateHelper @bids
     render :layout => 'base_courses'
    
   end
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index c4eb875a..e8913108 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -92,9 +92,6 @@
 
 <% end %>
 <% end %>
-
 <div class="pagination">
-	<ul>
-		<%= pagination_links_full bid_pages %>
-		<ul>
+	<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
 </div>
\ No newline at end of file
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 16a4cbf2..6dbfd67d 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -54,7 +54,6 @@
 		<ul class="d-p-projectlist">
 			<% projects = find_miracle_project(10, 3) %>
 			<% projects.map do |project| %>
-			<!--<% cache cache_key_for_project(project) do %> -->
 			<li style="position:relative;height:6em;" class='<%= cycle("odd", "even") %>'>
 				<div style="float: left;">
 					<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
@@ -75,7 +74,6 @@
 			        :id => "tooltip-#{project.id}" %>
 				</div>
 			</li>
-           <!--<%end %> -->
 			<% end; reset_cycle  %>
 		</ul>
 	</div>
@@ -88,7 +86,6 @@
 			<div class="user-message-box-list" style="margin-top: 10px;">
 				<%activities = find_all_activities%>
 			<% activities.each do |event| %>
-                  <!--<% cache cache_key_for_event(event) do %> -->
 			<li style="display: block;height:60px; padding-bottom: 4px;">
 				<div class="inner-right" style="float: left; height: 100%; ">
 					<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
@@ -99,7 +96,6 @@
 				<p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
 				</div>
 			</li>
-                      <!--<%end %> --><!-- cache -->
 			    <% end  %>	
 			</div>
 		</ul>
@@ -107,7 +103,6 @@
 
 <div class="right" style="float: right; width: 48%; "> 
 	<ul class="welcome-message-list">
-      <!--<% cache 'forum_links' do %> -->
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
 		  <h3 style="color: rgb(21, 188, 207);">
 			<strong>贴吧动态</strong>
@@ -115,11 +110,9 @@
 			<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%></h3>
 			<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
 		</div>
-          <!--<%end %> -->
 		<div class="welcome-box-list-new memo_activity">
 			<% topics = find_new_forum_topics(7) %>
 		<% topics.includes(:forum, :last_reply, :author).each do |topic|%>
-              <!--<% cache cache_key_for_topic(topic) do %> -->
 			<li class="message-brief-intro">
 				<div class='memo_title text_nowrap'>
 					<%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
@@ -139,7 +132,6 @@
 					</span>
 				</div>
 			</li>
-                  <!--<%end %> --> <!-- cache -->
 		<% end %>
 		</div>
 	</ul>