From c357971e8a8ff1e688ac95ed32b783117aaf540f Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 27 Apr 2016 16:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E3=80=81?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E7=AD=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/boards_controller.rb | 60 +++++++++++++--------
app/views/blogs/index.js.erb | 2 +-
app/views/boards/show.js.erb | 4 +-
app/views/users/_course_boardlist.html.erb | 4 +-
app/views/users/_project_boardlist.html.erb | 4 +-
app/views/users/_user_course_list.html.erb | 2 +-
app/views/users/_user_project_list.html.erb | 2 +-
app/views/users/user_courselist.html.erb | 4 +-
app/views/users/user_courselist.js.erb | 2 +-
app/views/users/user_projectlist.html.erb | 4 +-
app/views/users/user_projectlist.js.erb | 2 +-
db/schema.rb | 48 ++++++-----------
12 files changed, 67 insertions(+), 71 deletions(-)
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index aab9bf963..2e499ea1d 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -28,6 +28,7 @@ class BoardsController < ApplicationController
helper :watchers
helper :project_score
helper :attachments
+ include PraiseTreadHelper
def index
#modify by nwb
@flag = params[:flag] || false
@@ -121,6 +122,15 @@ class BoardsController < ApplicationController
end
end
+ #根据 赞+回复数排序
+ if @order.to_i == 2
+ @type = 2
+ @b_sort == 1 ? @topics = @topics.sort{|x,y| get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) <=> get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) } : @topics = @topics.sort{|x,y| get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) <=> get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) }
+ @topics = @topics.sort{|x,y| y.sticky <=> x.sticky}
+ else
+ @type = 1
+ end
+
#分页
@limit = 10
@is_remote = true
@@ -132,28 +142,34 @@ class BoardsController < ApplicationController
@page = params[:page] ? params[:page].to_i + 1 : 0
@message = Message.new(:board => @board)
#modify by nwb
- respond_to do |format|
- format.js
- format.html {
- if @project
- render :action => 'show', :layout => 'base_projects'
- elsif @course
- @params=params
- render :action => 'show', :layout => 'base_courses'
- end
- }
- format.atom {
- @messages = @board.messages.
- reorder('created_on DESC').
- includes(:author, :board).
- limit(Setting.feeds_limit.to_i).
- all
- if @project
- render_feed(@messages, :title => "#{@project}: #{@board}")
- elsif @course
- render_feed(@messages, :title => "#{@course}: #{@board}")
- end
- }
+ if (params[:page] || params[:order])
+ respond_to do |format|
+ format.js{render "show.js.erb"}
+ end
+ else
+ respond_to do |format|
+ format.js
+ format.html {
+ if @project
+ render :action => 'show', :layout => 'base_projects'
+ elsif @course
+ @params=params
+ render :action => 'show', :layout => 'base_courses'
+ end
+ }
+ format.atom {
+ @messages = @board.messages.
+ reorder('created_on DESC').
+ includes(:author, :board).
+ limit(Setting.feeds_limit.to_i).
+ all
+ if @project
+ render_feed(@messages, :title => "#{@project}: #{@board}")
+ elsif @course
+ render_feed(@messages, :title => "#{@course}: #{@board}")
+ end
+ }
+ end
end
end
diff --git a/app/views/blogs/index.js.erb b/app/views/blogs/index.js.erb
index 6c8835f6f..cdbc3cc01 100644
--- a/app/views/blogs/index.js.erb
+++ b/app/views/blogs/index.js.erb
@@ -1 +1 @@
-$("#blog-list").html('<%= escape_javascript( render :partial => 'blogs/article', :locals => {:topics => @topics} ) %>');
\ No newline at end of file
+$("#blog-list").replaceWith('<%= escape_javascript( render :partial => 'blogs/article', :locals => {:topics => @topics} ) %>');
\ No newline at end of file
diff --git a/app/views/boards/show.js.erb b/app/views/boards/show.js.erb
index c842197c7..cb7ee64a1 100644
--- a/app/views/boards/show.js.erb
+++ b/app/views/boards/show.js.erb
@@ -1,5 +1,5 @@
<% if @course %>
- <%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1} %>
+ $("#course-boardlist").replaceWith('<%= escape_javascript( render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>');
<% else %>
- $("#show_more_project_topic").replaceWith("<%= escape_javascript( render :partial => 'boards/project_show_detail',:locals => {:topics => @topics, :page => @page} )%>");
+ $("#project-boardlist").replaceWith('<%= escape_javascript( render :partial => 'users/project_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>');
<% end %>
\ No newline at end of file
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index 3bb29282d..9b5ea305a 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -1,5 +1,5 @@
-