diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index ba7c574..be56aeb 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -6,13 +6,13 @@ class NewsController < ApplicationController if params[:keywords] !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:postdate=>"desc"} - news = NewsBulletin.where(:title.ne => "").any_of(:title => /#{params[:keywords].to_s}/i).can_display.is_approved.order_by(sort).filter_by_categories(["all"]).per(15) if !params[:keywords].nil? + news = NewsBulletin.where(:title.ne => "").any_of(:title => /#{params[:keywords].to_s}/i).is_approved.order_by(sort).filter_by_categories(["all"]).per(15) if !params[:keywords].nil? news_count = news.count keyword = params[:keywords] elsif params[:department] !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:postdate=>"desc"} dept = Department.find_by(:uid => params["department"].split("-").last) rescue nil - news = NewsBulletin.where(:title.ne => "" ,:department => dept).can_display.is_approved.order_by(sort).filter_by_categories(["all"]) if !dept.nil? + news = NewsBulletin.where(:title.ne => "" ,:department => dept).is_approved.order_by(sort).filter_by_categories(["all"]) if !dept.nil? news_count = news.count keywords = params[:department].split("-") @@ -26,7 +26,7 @@ class NewsController < ApplicationController elsif params[:unit] unit = Unit.find_by(:uid => params["unit"].split("-").last) rescue nil !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:postdate=>"desc"} - news = NewsBulletin.where(:title.ne => "" ,:unit => unit).can_display.is_approved.order_by(sort).filter_by_categories(["all"]) if !unit.nil? + news = NewsBulletin.where(:title.ne => "" ,:unit => unit).is_approved.order_by(sort).filter_by_categories(["all"]) if !unit.nil? news_count = news.count keywords = params[:unit].split("-") @@ -39,7 +39,7 @@ class NewsController < ApplicationController elsif params["category"] !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:postdate=>"desc"} category = Category.find_by(:uid => params["category"].split("-").last) rescue nil - news = NewsBulletin.all.where(:title.ne => "").can_display.is_approved.order_by(sort).filter_by_categories([category.id.to_s]) if !category.nil? + news = NewsBulletin.all.where(:title.ne => "").is_approved.order_by(sort).filter_by_categories([category.id.to_s]) if !category.nil? news_count = news.count keywords = params[:category].split("-") @@ -51,7 +51,7 @@ class NewsController < ApplicationController end end !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:postdate=>"desc"} - news = NewsBulletin.where(:title.ne => "" ,:is_preview.in=>[false,nil]).can_display.is_approved.order_by(sort).filter_by_categories.filter_by_tags(OrbitHelper.params['tags']) if news.nil? + news = NewsBulletin.where(:title.ne => "" ,:is_preview.in=>[false,nil]).is_approved.order_by(sort).filter_by_categories.filter_by_tags(OrbitHelper.params['tags']) if news.nil? page = Page.where(:module => "news").first rescue nil ma = ModuleApp.find_by_key("news") rescue nil categories = ma.categories.enabled.collect do |cat| diff --git a/app/views/admin/news/_form.html.erb b/app/views/admin/news/_form.html.erb index 808b39d..68af509 100644 --- a/app/views/admin/news/_form.html.erb +++ b/app/views/admin/news/_form.html.erb @@ -218,6 +218,8 @@
※內文裡單一圖片尺寸的最大寬度600px(滿版),如圖片要縮小,請依比例調整。
+ ※新聞及公告發佈後台請增加下列文字:建議使用IE10、IE11、Chrome(最佳)、Firefox等瀏覽器。 +
※如何剪裁新聞圖片。