From c2f3f45196598705a446036b52874734894f8bff Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 13 Aug 2012 11:34:14 +0800 Subject: [PATCH] Fix for link in nccu widget --- app/controllers/pages_controller.rb | 2 ++ .../panel/announcement/widget/bulletins/_bulletins.html.erb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index c4ee33c0..f1d307f4 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -49,6 +49,8 @@ class PagesController < ApplicationController def show_from_link url = "/#{@item.path}?id=#{params[:id]}" options = '' + options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank? + options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank? options << "&preview=#{params[:preview]}" unless params[:preview].blank? redirect_to(url + options) unless save_from_no_lang_for_page end diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb index 41311c39..eb70e2f8 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb @@ -1,6 +1,6 @@ <% @bulletins.each do |bulletin| %>
  • - <%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id ,:tag_id=>bulletin.tags.first.id ) %> + <%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :tag_id => @selected_tag.id ) %>
    • <% end %>