jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突

This commit is contained in:
cxt 2015-10-15 16:28:03 +08:00
parent caa278d9f5
commit 0f0351b343
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/boards_controller.rb
View File

@ -148,7 +148,10 @@ class BoardsController < ApplicationController
@message = Message.new(:board => @board) @message = Message.new(:board => @board)
#modify by nwb #modify by nwb
respond_to do |format|
format.js
format.html {
if @project
render :action => 'show', :layout => 'base_projects' render :action => 'show', :layout => 'base_projects'
elsif @course elsif @course
@params=params @params=params
@ -157,6 +160,10 @@ class BoardsController < ApplicationController
} }
format.atom { format.atom {
@messages = @board.messages. @messages = @board.messages.
reorder('created_on DESC').
includes(:author, :board).
limit(Setting.feeds_limit.to_i).
all
if @project if @project
render_feed(@messages, :title => "#{@project}: #{@board}") render_feed(@messages, :title => "#{@project}: #{@board}")
elsif @course elsif @course