From aeb3fb3fdbf30cf9e0240f74e999c756f9ef1c7e Mon Sep 17 00:00:00 2001
From: nccu <nccu@test174.(none)>
Date: Mon, 9 Mar 2015 11:10:23 +0800
Subject: [PATCH] fix json & postdate

---
 app/controllers/admin/bulletins_controller.rb | 2 ++
 app/views/admin/announcements/_form.html.erb  | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/bulletins_controller.rb b/app/controllers/admin/bulletins_controller.rb
index fa3e175..96d5a0c 100644
--- a/app/controllers/admin/bulletins_controller.rb
+++ b/app/controllers/admin/bulletins_controller.rb
@@ -22,6 +22,7 @@ class Admin::BulletinsController < ApplicationController
     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(: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)
 
@@ -82,6 +83,7 @@ class Admin::BulletinsController < ApplicationController
       bulletin_count = Bulletin.all
     end
     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
     # End
 
diff --git a/app/views/admin/announcements/_form.html.erb b/app/views/admin/announcements/_form.html.erb
index 21b91a3..e252e6d 100644
--- a/app/views/admin/announcements/_form.html.erb
+++ b/app/views/admin/announcements/_form.html.erb
@@ -226,10 +226,13 @@
 
 <% content_for :page_specific_javascript do %>
   <script>
+
     $(function() {
-      var getDate = new Date();
-      var toDay = getDate.getFullYear()+"/"+ (getDate.getMonth()+1)+"/"+getDate.getDate()+" "+getDate.getHours()+":"+getDate.getMinutes();
-      $('input[name="bulletin[postdate]"]').val(toDay);
+      if (location.pathname.substr(-3)=='new'){
+        var getDate = new Date();
+        var toDay = getDate.getFullYear()+"/"+ (getDate.getMonth()+1)+"/"+getDate.getDate()+" "+getDate.getHours()+":"+getDate.getMinutes();
+        $('input[name="bulletin[postdate]"]').val(toDay);
+      }
 
       $("#main-wrap").after("");