alex
/
nccu-news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix json & postdate

This commit is contained in:
nccu 2015-03-09 11:11:24 +08:00
parent c6cce8eb3e
commit 4c07156162
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ class Admin::NewsbulletinsController < ApplicationController
bulletins = bulletins.where(:category_id.in => params[:categories]) if !params[:categories].blank? bulletins = bulletins.where(:category_id.in => params[:categories]) if !params[:categories].blank?
bulletins = bulletins.where(:tagged_ids.in => params[:tags]) if !params[:tags].blank? bulletins = bulletins.where(:tagged_ids.in => params[:tags]) if !params[:tags].blank?
bulletins = bulletins.where(:is_preview.in=>[false,nil]) bulletins = bulletins.where(:is_preview.in=>[false,nil])
bulletins = bulletins.where(:approved.ne => false , :rejected.ne => true)
bulletins = bulletins.desc( :is_top, :postdate).page(page_num).per(per_page) bulletins = bulletins.desc( :is_top, :postdate).page(page_num).per(per_page)
@ -82,6 +83,7 @@ class Admin::NewsbulletinsController < ApplicationController
bulletin_count = NewsBulletin.all bulletin_count = NewsBulletin.all
end end
bulletin_count = bulletin_count.where(:is_preview.in=>[false,nil]) bulletin_count = bulletin_count.where(:is_preview.in=>[false,nil])
bulletin_count = bulletin_count.where(:approved.ne => false , :rejected.ne => true)
total_pages = bulletin_count.count total_pages = bulletin_count.count
# End # End

8
app/views/admin/news/_form.html.erb
View File

@ -334,9 +334,11 @@
var fileupload_size_limit = fileupload_size_limit_mb*1000*1000; // 1MB var fileupload_size_limit = fileupload_size_limit_mb*1000*1000; // 1MB
$(function() { $(function() {
var getDate = new Date(); if (location.pathname.substr(-3)=='new'){
var toDay = getDate.getFullYear()+"/"+ (getDate.getMonth()+1)+"/"+getDate.getDate()+" "+getDate.getHours()+":"+getDate.getMinutes(); var getDate = new Date();
$('input[name="news_bulletin[postdate]"]').val(toDay); var toDay = getDate.getFullYear()+"/"+ (getDate.getMonth()+1)+"/"+getDate.getDate()+" "+getDate.getHours()+":"+getDate.getMinutes();
$('input[name="news_bulletin[postdate]"]').val(toDay);
}
$("#main-wrap").after(""); $("#main-wrap").after("");