From 25a911b4f869cd878ee7c4d081d464191bf36ed5 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Wed, 1 Aug 2012 16:33:46 +0800
Subject: [PATCH] Change for page: take category and tag at the same time

---
 app/controllers/pages_controller.rb                      | 9 ++++++++-
 .../widget/bulletins/bulletins_side_bar.html.erb         | 2 +-
 .../news_bulletins/news_bulletins_side_bar.html.erb      | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 3b0978f9..7a0ffa43 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -62,7 +62,14 @@ class PagesController < ApplicationController
    
    def get_item
       module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
-      @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action]})
+      if !params[:category_id].blank? && !params[:tag_id].blank?
+        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category => params[:category_id], :tag => params[:tag_id]})
+      elsif !params[:category_id].blank?
+        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category => params[:category_id]})
+      elsif !params[:tag_id].blank?
+        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :tag => params[:tag_id]})
+      end
+      @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action]}) unless @item
       #TODO 需要做 error handler 處理沒有新增該模組頁面導致錯誤的可能性
    end
   
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb
index c7b31818..ce06d2e7 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb
@@ -13,7 +13,7 @@
 	<h3 class="h3"><%= t('announcement.tag_cloud') %></h3> 								
 	<div class="cloud"> 		
 		<% @tags.each do |tag| %>	
-			<%= link_to tag[I18n.locale], panel_announcement_front_end_bulletins_path(:tag_id => tag.id), :class => "#{tag.cloud_amper} hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil} " %>
+			<%= link_to tag[I18n.locale], panel_announcement_front_end_bulletins_path(:tag_id => tag.id, :category_id => params[:category_id]), :class => "#{tag.cloud_amper} hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil} " %>
 		<% end %>
 	</div> 							
 </div> 							
diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb
index f754b763..bf127ed2 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb
@@ -13,7 +13,7 @@
 	<h3 class="h3"><%= t('announcement.tag_cloud') %></h3> 								
 	<div class="cloud"> 		
 		<% @tags.each do |tag| %>	
-			<%= link_to tag[I18n.locale], panel_news_front_end_news_bulletins_path(:tag_id => tag.id),:class => "#{tag.cloud_amper} hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil} " %>
+			<%= link_to tag[I18n.locale], panel_news_front_end_news_bulletins_path(:tag_id => tag.id, :category_id => params[:category_id]),:class => "#{tag.cloud_amper} hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil} " %>
 		<% end %>	
 	</div> 							
 </div>