From 0029ef2b5a3f2911a83c2a989ede9b954eedcf79 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 27 Feb 2012 18:40:08 +0800
Subject: [PATCH] Fix bug due to image_filename -> image_identifier

---
 .../panel/announcement/back_end/bulletins_controller.rb         | 1 -
 .../views/panel/announcement/back_end/bulletins/show.html.erb   | 2 +-
 .../views/panel/web_resource/back_end/web_links/show.html.erb   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 7e66179a4..48b9ac884 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -100,7 +100,6 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
 	# @bulletin.image.clear if params[:bulletin][:image_del] == '1'
 	if params[:bulletin][:image_del] == '1' 
 		@bulletin.remove_image!
-		@bulletin.image_filename = nil
 		# @bulletin.image_del = nil
 		params[:bulletin][:image_del] = nil
 	end
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
index c3ba2c09d..f02d91569 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
@@ -21,7 +21,7 @@
 	</li>
 	<li>
   <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
-  <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_filename} if @bulletin.image.file %>
+  <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
 	</li>
 	<li>
   <b><%= t('announcement.subtitle') %></b>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
index c3ba2c09d..f02d91569 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
@@ -21,7 +21,7 @@
 	</li>
 	<li>
   <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
-  <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_filename} if @bulletin.image.file %>
+  <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
 	</li>
 	<li>
   <b><%= t('announcement.subtitle') %></b>