From 93946c37f4ee4b25605b697aea69829d4154cd45 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Wed, 9 May 2012 15:54:00 +0800
Subject: [PATCH] fix wrong link

---
 .../panel/announcement/back_end/bulletin_categorys_helper.rb    | 2 +-
 .../back_end/bulletin_categorys/_bulletin_category.html.erb     | 2 +-
 .../panel/news/back_end/news_bulletin_categorys_helper.rb       | 2 +-
 .../news_bulletin_categorys/_news_bulletin_category.html.erb    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb
index 96e09e61d..1fccbbe14 100644
--- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb
+++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletin_categorys_helper.rb
@@ -2,7 +2,7 @@ module Panel::Announcement::BackEnd::BulletinCategorysHelper
 include ActionView::Helpers::UrlHelper
 
   
-  def show_permission_link(bulletin_category)
+  def show_anc_cate_permission_link(bulletin_category)
     type = 'submit'
     oa = bulletin_category.get_object_auth_by_title(type)
     if oa.nil?
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
index 250aabc8c..b5013698b 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
@@ -5,7 +5,7 @@
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
 					<%if is_manager? || is_admin? %>
-						<li><%= show_permission_link(bulletin_category) %></li>
+						<li><%= show_anc_cate_permission_link(bulletin_category) %></li>
 					<% end %>
 					<% if is_admin?%>
 						<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
diff --git a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletin_categorys_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletin_categorys_helper.rb
index 51cbadcf5..74905640b 100644
--- a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletin_categorys_helper.rb
+++ b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletin_categorys_helper.rb
@@ -2,7 +2,7 @@ module Panel::News::BackEnd::NewsBulletinCategorysHelper
 include ActionView::Helpers::UrlHelper
 
   
-  def show_permission_link(news_bulletin_category)
+  def show_news_cate_permission_link(news_bulletin_category)
     type = 'submit'
     oa = news_bulletin_category.get_object_auth_by_title(type)
     if oa.nil?
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb
index 7c16678ae..94a4e851f 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_news_bulletin_category.html.erb
@@ -5,7 +5,7 @@
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
 					<%if is_manager? || is_admin? %>
-						<li><%= show_permission_link(news_bulletin_category) %></li>
+						<li><%= show_news_cate_permission_link(news_bulletin_category) %></li>
 					<% end %>
 					<% if is_admin?%>
 						<li><%= link_to t('bulletin_category.edit'), edit_panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :remote => true %></li>