Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/previews_controller.rb

@@ -16,11 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class PreviewsController < ApplicationController
-  before_filter :find_project, :find_attachments, :find_contest, except: [:contestnotification]
+  before_filter :find_project, :find_attachments, except: :contestnotification
 
   def issue
     @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
-    @issue = @contest.issues.find_by_id(params[:id]) unless params[:id].blank?
     if @issue
       @description = params[:issue] && params[:issue][:description]
       if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
@@ -65,12 +64,4 @@ class PreviewsController < ApplicationController
     render :partial => 'common/preview'
   end
 
-  private
-  def find_contest
-    contest_id = (params[:issue] && params[:issue][:contest_id]) || params[:contest_id]
-    @contest = Contest.find(contest_id)
-    rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
 end

app/controllers/test_controller.rb

@@ -26,7 +26,7 @@ class TestController < ApplicationController
   end
 
   def courselist
-    @courses = Project.course_entities
+    @courses = paginateHelper Course.includes(:homeworks).all, 10
   end
 
   def ziping files_path

app/views/layouts/bootstrap_base.html.erb

@@ -20,6 +20,7 @@
   <div class="container">
     <%= render_flash_messages %>
     <%= yield %>
+    <%= render :partial => 'layouts/bootstrap_base_footer' %>
   </div>
   
 
@@ -29,6 +30,5 @@
 
   <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
   <div id="ajax-modal" style="display:none;"></div>
-  <%= render :partial => 'layouts/bootstrap_base_footer' %>
 </body>
 </html>

app/views/test/courselist.html.erb

@@ -1,14 +1,5 @@
-<div class="alert alert-success">
-	<strong>Well done!</strong> You successfully read this important alert message.
-</div>
-<div class="alert alert-info">
-	<strong>Heads up!</strong> This alert needs your attention, but it's not super important.
-</div>
-<div class="alert alert-warning">
-	<strong>Warning!</strong> Best check yo self, you're not looking too good.
-</div>
 <div class="alert alert-danger">
-	<strong>Oh snap!</strong> Change a few things up and try submitting again.
+	<strong>Warning!</strong> you can stop.
 </div>
 
 <div class="page-header">
@@ -29,14 +20,15 @@
 				<div class="homeworks panel-heading">
 					<div class="panel-title">
 						<%= link_to homework.name, respond_path(homework) %>(<%=homework.homeworks.count %>)<%#Bid%>
-						<%= link_to "打包下载", zipdown_assort_path(obj_class: homework.class, obj_id: homework.id), :class => "btn btn-primary btn-sm" %><br/>
+						<%#= link_to "打包下载", zipdown_assort_path(obj_class: homework.class, obj_id: homework.id), :class => "btn btn-primary btn-sm" %><br/>
 					</div>
 				</div>
 				<div class="attach_item panel-body ">
 					<div class="col-md-offset-1">
 					<% homework.homeworks.each do |homeattach|%><%#homework.class == Bid %>
 					<% homeattach.attachments.each do |attach|%>
-					<%= link_to_attachment attach, author: true, :download => true %> (<%=attach.author%>)
+					<%= attach.filename %>
+					<%#= link_to_attachment attach, author: true, :download => true %> (<%=attach.author%>)
 					<br/>
 					<% homeworks_attach_path << attach.storage_path %>
 					<% end %>
@@ -44,7 +36,7 @@
 					</div>
 				</div>
 				<%# 所有作业的文件列表%>
-				<!-- (<%=homeworks_attach_path.count%>):<%= homeworks_attach_path.to_json %> -->
+				<!-- (<%#=homeworks_attach_path.count%>):<%#= homeworks_attach_path.to_json %> -->
 			</div>
 			<% end %>
 		</div>
@@ -52,3 +44,4 @@
 	<hr/>
 	<% end %>
 </div>
+<div class="pagination"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %></div>