diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
index 49f24079..88920b9e 100644
--- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
+++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb
@@ -12,4 +12,12 @@ module Panel::Announcement::BackEnd::BulletinsHelper
by_bulletin or by_user
end
+ def show_bulletin_title_at_index (bulletin)
+ if bulletin.is_checked?
+ link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''
+ else
+ bulletin.title[I18n.locale]
+ end
+ end
+
end
\ No newline at end of file
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 b5013698..6b98e466 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
@@ -4,14 +4,13 @@
<%= bulletin_category.key %>
- <%if is_manager? || is_admin? %>
- - <%= show_anc_cate_permission_link(bulletin_category) %>
- <% end %>
<% if is_admin?%>
- <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %>
- <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
<% end %>
-
+ <%if is_manager? || is_admin? %>
+ - <%= show_anc_cate_permission_link(bulletin_category) %>
+ <% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index afb57306..edff4d2d 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -30,8 +30,7 @@
<%= bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %> |
- <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
-
+ <%= show_bulletin_title_at_index bulletin%>
<% if (bulletin.create_user_id == current_user.id) || is_manager? %>
diff --git a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
index b77e70a9..e2765c33 100644
--- a/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
+++ b/vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
@@ -12,4 +12,13 @@ module Panel::News::BackEnd::NewsBulletinsHelper
by_news_bulletin or by_user
end
+ def show_news_bulletin_title_at_index (news_bulletin)
+ if news_bulletin.is_checked?
+
+ link_to news_bulletin.title[I18n.locale], panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id) rescue ''
+ else
+ news_bulletin.title[I18n.locale]
+ end
+ end
+
end
\ No newline at end of file
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 94a4e851..f96f8fb4 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
@@ -4,14 +4,13 @@
<%= news_bulletin_category.key %>
- <%if is_manager? || is_admin? %>
- - <%= show_news_cate_permission_link(news_bulletin_category) %>
- <% end %>
<% if is_admin?%>
- <%= link_to t('bulletin_category.edit'), edit_panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :remote => true %>
- <%= link_to t('bulletin_category.delete'), panel_news_back_end_news_bulletin_category_path(news_bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
<% end %>
-
+ <%if is_manager? || is_admin? %>
+ - <%= show_news_cate_permission_link(news_bulletin_category) %>
+ <% end %>
|
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
index 7181a1cd..02efd630 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
@@ -29,9 +29,7 @@
<%= news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] rescue nil %> |
-
- <%= link_to news_bulletin.title[I18n.locale], panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id) rescue ''%>
-
+ | <%= show_news_bulletin_title_at_index news_bulletin%>
<% if (news_bulletin.create_user_id == current_user.id) || is_manager? %>
|