Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5

2014-12-19 17:53:55 +08:00 · 2014-12-19 17:53:55 +08:00 · ed13c81880
parent 0e7e4180a6 e3e15a1ef2
commit ed13c81880
1 changed files with 8 additions and 4 deletions
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@ -76,10 +76,14 @@ class PagesController < ApplicationController
          params[:url] = page.url
          categories = []
          if page.module == "member"
-            page.categories.each do |c|
-              category = Role.find(c) rescue nil
-              if !category.nil? && !category.disabled
-                categories << c
+            if page.categories.first == "all"
+              categories = ["all"]
+            else
+              page.categories.each do |c|
+                category = Role.find(c) rescue nil
+                if !category.nil? && !category.disabled
+                  categories << c
+                end
              end
            end
          else