From 2402f953f06ed2ebed510843d8dacf82b4898568 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 19 Dec 2014 16:33:23 +0800 Subject: [PATCH] fixed member categories all problem --- app/controllers/pages_controller.rb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index dc3e5b4..b243590 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -75,10 +75,19 @@ class PagesController < ApplicationController end params[:url] = page.url categories = [] - page.categories.each do |c| - category = Category.find(c) rescue nil - if !category.nil? && !category.disable - categories << c + if page.module == "member" + page.categories.each do |c| + category = Role.find(c) rescue nil + if !category.nil? && !category.disabled + categories << c + end + end + else + page.categories.each do |c| + category = Category.find(c) rescue nil + if !category.nil? && !category.disable + categories << c + end end end categories = ["all"] if categories.blank?