From 6a4abc6c43ac8d74ce58e96fb0682a4db5ff8cc2 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Wed, 27 Jun 2012 09:59:32 +0800
Subject: [PATCH] fix news error

---
 app/assets/javascripts/bulletin_form.js.erb                   | 4 ++++
 app/assets/javascripts/news_bulletin_form.js                  | 4 ++++
 .../views/panel/announcement/back_end/bulletins/edit.html.erb | 4 ++++
 .../panel/news/back_end/news_approvals_controller.rb          | 4 ++--
 .../views/panel/news/back_end/news_bulletins/edit.html.erb    | 3 +++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb
index cf2dfd69..c51587f4 100644
--- a/app/assets/javascripts/bulletin_form.js.erb
+++ b/app/assets/javascripts/bulletin_form.js.erb
@@ -1,3 +1,5 @@
+$(document).ready(function(){
+//alert("Anc Loaded");
 $('.bulletin_links_block a.delete').live('click', function(){
   $(this).parents('.list_item').remove();
 });
@@ -16,4 +18,6 @@ $(document).on('click', '.quick_edit_cancel', function(){
   $('#' + tr).hide();
   $("tr#bulletin_file_" + $(this).prev().attr('value')).hide();
   $("tr#bulletin_link_" + $(this).prev().attr('value')).hide();
+});
+
 });
\ No newline at end of file
diff --git a/app/assets/javascripts/news_bulletin_form.js b/app/assets/javascripts/news_bulletin_form.js
index 6f0f9ac5..c6c98b68 100644
--- a/app/assets/javascripts/news_bulletin_form.js
+++ b/app/assets/javascripts/news_bulletin_form.js
@@ -1,3 +1,6 @@
+$(document).ready(function(){
+//alert("News Loaded");
+
 $('.news_bulletin_links_block a.delete').live('click', function(){
   $(this).parents('.list_item').remove();
 });
@@ -16,4 +19,5 @@ $(document).on('click', '.quick_edit_cancel', function(){
   $('#' + tr).hide();
   $("tr#news_bulletin_file_" + $(this).prev().attr('value')).hide();
   $("tr#news_bulletin_link_" + $(this).prev().attr('value')).hide();
+});
 });
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
index 27211047..c15e45b1 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
@@ -8,3 +8,7 @@
 		<%= render :partial => 'form', :locals => {:f => f} %>
 	<% end %>
 </div>
+<% content_for :page_specific_javascript do %>
+  <%= javascript_include_tag "bulletin_form" %>
+<% end %>
+
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
index 0f10fe91..7354d360 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
@@ -4,11 +4,11 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
   include AdminHelper
   
   def preview_and_approve
-    @news_bulletin = NewsBulletin.find params[:news_category][:id]
+    @news_bulletin = NewsBulletin.find params[:news_bulletin_id]
   end
   
   def approve
-    
+
   end
 
   def setting
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb
index 8149a86e..6603d41d 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb
@@ -8,3 +8,6 @@
 		<%= render :partial => 'form', :locals => {:f => f} %>
 	<% end %>
 </div>
+<% content_for :page_specific_javascript do %>
+  <%= javascript_include_tag "news_bulletin_form" %>
+<% end %>