From 81870c94125a6bc83c341409562b9b3b7a8d3aa6 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 7 Aug 2017 17:14:05 +0800 Subject: [PATCH] filter and new line to br --- app/controllers/e_papers_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/e_papers_controller.rb b/app/controllers/e_papers_controller.rb index 4679904..5c90ff6 100644 --- a/app/controllers/e_papers_controller.rb +++ b/app/controllers/e_papers_controller.rb @@ -3,7 +3,7 @@ class EPapersController < ApplicationController def index params = OrbitHelper.params page = Page.where(:page_id => params[:page_id]).first rescue nil - papers = Paper.can_display.order_by(:order_position => "asc").filter_by_categories + papers = Paper.can_display.filter_by_categories.desc(:period) f = papers.collect do |paper| statuses = paper.statuses_with_classname.collect do |status| { @@ -24,7 +24,7 @@ class EPapersController < ApplicationController "link_to_show" => OrbitHelper.url_to_show(paper.to_param), "title" => paper.title, "period" => paper.period, - "description" => paper.description, + "description" => paper.description.gsub(/(?:\n\r?|\r\n?)/, '
'), "category" => paper.category.title, "topic" => topics } @@ -51,7 +51,7 @@ class EPapersController < ApplicationController paper = Paper.find_by(:uid => params[:uid]) paper_thumb = !paper.image.nil? && !paper.image.url.nil? ? paper.image.thumb.url : "http://www.placehold.it/400x400/EFEFEF/AAAAAA" paper_full = !paper.image.nil? && !paper.image.url.nil? ? paper.image.url : "http://www.placehold.it/1000x1000/EFEFEF/AAAAAA" - topics = paper.topics.collect do |topic| + topics = paper.topics.asc(:created_at).collect do |topic| desc = ActionView::Base.full_sanitizer.sanitize(topic.content) timg = !topic.image.nil? && !topic.image.url.nil? ? topic.image.thumb.url : "http://www.placehold.it/400x400/EFEFEF/AAAAAA" fimg = !topic.image.nil? && !topic.image.url.nil? ? topic.image.url : "http://www.placehold.it/1000x1000/EFEFEF/AAAAAA"