From 55449efb352cc9f32de86b9c58742ba70c2ca303 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Wed, 27 Jun 2012 14:21:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=96=B0=E8=81=9E=E8=88=87=E5=85=AC?=
 =?UTF-8?q?=E5=91=8AQA=20=091.=E5=84=AA=E5=85=88=E8=99=95=E7=90=86-?=
 =?UTF-8?q?=E5=BF=AB=E9=80=9F=E7=B7=A8=E8=BC=AF=E4=B8=AD=E7=9A=84=E6=AA=94?=
 =?UTF-8?q?=E6=A1=88=E4=B8=8A=E5=82=B3=E7=84=A1=E6=B3=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E5=8F=AF=E5=88=AA=E9=99=A4=20=092.=E5=84=AA?=
 =?UTF-8?q?=E5=85=88=E8=99=95=E7=90=86-=E7=B7=A8=E8=BC=AF=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=AA=94=E6=A1=88=E5=88=97=E8=A1=A8=EF=BC=8C=E7=84=A1?=
 =?UTF-8?q?=E6=B3=95=E5=88=AA=E9=99=A4=20=093.=E5=84=AA=E5=85=88=E8=99=95?=
 =?UTF-8?q?=E7=90=86-=E5=88=AA=E9=99=A4=E6=99=82=E6=87=89=E5=BD=88?=
 =?UTF-8?q?=E5=87=BA=E8=AD=A6=E5=91=8A=E8=A6=96=E7=AA=97=EF=BC=8C=E8=AB=8B?=
 =?UTF-8?q?user=E7=A2=BA=E8=AA=8D=E4=B8=80=E6=AC=A1=EF=BC=8C=E5=86=8D?=
 =?UTF-8?q?=E5=B0=87=E6=AA=94=E6=A1=88=E5=88=AA=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/bulletin_form.js.erb                 | 6 ++++--
 .../{news_bulletin_form.js => news_bulletin_form.js.erb}    | 6 ++++--
 .../back_end/bulletins/_form_bulletin_file.html.erb         | 1 +
 .../panel/announcement/back_end/bulletins/index.html.erb    | 6 ++++++
 4 files changed, 15 insertions(+), 4 deletions(-)
 rename app/assets/javascripts/{news_bulletin_form.js => news_bulletin_form.js.erb} (78%)

diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb
index c51587f4..606ada3e 100644
--- a/app/assets/javascripts/bulletin_form.js.erb
+++ b/app/assets/javascripts/bulletin_form.js.erb
@@ -9,8 +9,10 @@ $('.bulletin_files_block a.delete').live('click', function(){
 });
 
 $(document).on('click', '.action a.remove_existing_record', function(){
-  $(this).next('.should_destroy').attr('value', 1);
-  $("tr #" + $(this).prev().attr('value')).hide();
+  if(confirm("<%= I18n.t('announcement.sure?')%>")){
+    $(this).next('.should_destroy').attr('value', 1);
+    $("tr#" + $(this).prev().attr('value')).hide();
+  }
 });
 
 $(document).on('click', '.quick_edit_cancel', function(){
diff --git a/app/assets/javascripts/news_bulletin_form.js b/app/assets/javascripts/news_bulletin_form.js.erb
similarity index 78%
rename from app/assets/javascripts/news_bulletin_form.js
rename to app/assets/javascripts/news_bulletin_form.js.erb
index 9038cbb8..d3a3c2c7 100644
--- a/app/assets/javascripts/news_bulletin_form.js
+++ b/app/assets/javascripts/news_bulletin_form.js.erb
@@ -10,8 +10,10 @@ $('.news_bulletin_files_block a.delete').live('click', function(){
 });
 
 $(document).on('click', '.action a.remove_existing_record', function(){
-  $(this).next('.should_destroy').attr('value', 1);
-  $("tr#" + $(this).prev().attr('value')).hide();
+    if(confirm("<%= I18n.t('news.sure?')%>")){
+      $(this).next('.should_destroy').attr('value', 1);
+      $("tr#" + $(this).prev().attr('value')).hide();
+    }
 });
 
 $(document).on('click', '.quick_edit_cancel', function(){
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
index 143525f0..8aeab6c6 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
@@ -63,6 +63,7 @@
 			  <a class="delete"><i class="icon-remove"></i></a>
 			<% else %>	
 			  <%= f.hidden_field :id %>
+			  <%= hidden_field_tag :tr, (dom_id form_bulletin_file) %>
 			  <a class="remove_existing_record"><i class="icon-remove"></i></a>
 			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
 			<% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index c64035a5..526dbead 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -18,6 +18,12 @@
 	</div>
 </div>
 
+<div id="news_bulletin_file_qe">
+	<div id="modal-file" class="modal fade">
+		<%= render :partial => "bulletin_file_qe" %>
+	</div>
+</div>
+
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "bulletin_form" %>
 	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>