Revert "add Member frontend page selection options and fix backend role filter page"

This reverts commit ea3f9c8163.

app/controllers/admin/items_controller.rb

@@ -40,18 +40,8 @@ class Admin::ItemsController < OrbitBackendController
       m["main"] = [module_app.label, module_app.id.to_s]
       m["sub"] = module_app.app_pages.map{|name, data| [t(data["i18n"]), name]} rescue []
       m["sub"] << [I18n.t('default_widget.default_widget'),'default_widget'] if module_app.has_default_widget?
-   
-      if module_app.key == 'member'
-        m["category"] = RoleStatus.where(:role_id=> RoleStatus.get_role_data("teacher") ).map{|category| [category.title, category.id.to_s] } rescue ''
-        m["tags"] = RoleCategory.where(:role_id=> RoleCategory.get_role_data("teacher") ).map{|category| [category.title, category.id.to_s] } rescue ''
-      elsif module_app.key == 'member_staff'
-        m["category"] = RoleStatus.where(:role_id=> RoleStatus.get_role_data("staff") ).map{|category| [category.title, category.id.to_s] } rescue ''
-        m["tags"] = RoleCategory.where(:role_id=> RoleCategory.get_role_data("staff") ).map{|category| [category.title, category.id.to_s] } rescue ''
-      else
-        m["category"] = module_app.categories.map{|category| [category.title, category.id.to_s] } rescue ''
-        m["tags"] = module_app.tags.map{|tag| [tag.name, tag.id.to_s] } rescue ''
-      end
-
+      m["category"] = module_app.categories.map{|category| [category.title, category.id.to_s] } rescue ''
+      m["tags"] = module_app.tags.map{|tag| [tag.name, tag.id.to_s] } rescue ''
       m["count"] = module_app.get_registration.get_data_count.to_a
       module_apps << m
     end

app/controllers/admin/page_parts_controller.rb

@@ -68,19 +68,8 @@ class Admin::PagePartsController < OrbitBackendController
       m = {}
       m["main"] = [module_app.label, module_app.id.to_s]
       m["sub"] = module_app.widgets.map{|name, data| [t(data["i18n"]), name]} rescue []
-
-   
-      if module_app.key == 'member'
-        m["category"] = RoleStatus.can_display.where(:role_id=> RoleStatus.get_role_data("teacher") ).map{|category| [category.title, category.id.to_s] } rescue ''
-        m["tags"] = RoleCategory.can_display.where(:role_id=> RoleCategory.get_role_data("teacher") ).map{|category| [category.title, category.id.to_s] } rescue ''
-      elsif module_app.key == 'member_staff'
-        m["category"] = RoleStatus.can_display.where(:role_id=> RoleStatus.get_role_data("staff") ).map{|category| [category.title, category.id.to_s] } rescue ''
-        m["tags"] = RoleCategory.can_display.where(:role_id=> RoleCategory.get_role_data("staff") ).map{|category| [category.title, category.id.to_s] } rescue ''
-      else
-        m["category"] = module_app.categories.map{|category| [category.title, category.id.to_s] } rescue ''
-        m["tags"] = module_app.tags.map{|tag| [tag.name, tag.id.to_s] } rescue ''
-      end
-      
+      m["category"] = module_app.categories.map{|category| [category.title, category.id.to_s] } rescue ''
+      m["tags"] = module_app.tags.map{|tag| [tag.name, tag.id.to_s] } rescue ''
       m["count"] = module_app.get_registration.get_data_count.to_a
       module_apps << m
     end