developers
/
nccu-news
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed json for nccu

This commit is contained in:
Harry Bomrah 2015-09-21 15:56:15 +08:00
parent eacafbcc86
commit fc35327d11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/newsbulletins_controller.rb
View File

@ -15,7 +15,7 @@ class Admin::NewsbulletinsController < ApplicationController
keyword = Regexp.new(".*"+params[:keyword]+".*")
bulletins = NewsBulletin.any_of({:title=>keyword},{:subtitle=>keyword},{:text=>keyword})
else
bulletins = NewsBulletin.all
bulletins = NewsBulletin.all.can_display
end
bulletins = bulletins.where(:is_hot => params[:is_hot]) if !params[:is_hot].blank?
@ -53,7 +53,7 @@ class Admin::NewsbulletinsController < ApplicationController
end rescue nil
text = {"en" => "", "zh_tw" => ""}
text["en"] = (b.text_translations["en"].nil? ? "" :smart_convertor(b.text_translations["en"]))
text["en"] = (b.text_translations["en"].nil? ? "" : smart_convertor(b.text_translations["en"]))
text["zh_tw"] = (b.text_translations["zh_tw"].nil? ? "" : smart_convertor(b.text_translations["zh_tw"]))
author = User.find(b.create_user_id).member_profile.name rescue ""