New UI changes(tags, categories, authorisations, module index…)

To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
This commit is contained in:
chris committed 2013-07-02 16:46:44 +08:00
1 parent 07b3857465
commit 856898016b
1495 files changed
+52132 -9876

No files matched your search

+22 -8
View File
@@ -37,7 +37,9 @@ module OrbitApp
@front_end_app_pages = nil
@module_label = 'rulingcom.errors.init.module_app_noname'
@data_count = 1..15 # as default
@has_category = nil
@has_tag = nil
@is_authorizable = nil
block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
setup_module_app
end
@@ -92,6 +94,10 @@ module OrbitApp
@data_count
end
def get_icon_class
@side_bar.get_icon_class
end
def get_widget_by_path(path)
if @widget_set
@widget_set.find_by_path(path)
@@ -112,14 +118,6 @@ module OrbitApp
@widget_set.nil? ? {} : @widget_set.to_module_app_format
end
def get_categories
@widget_set.get_categories rescue []
end
def get_tags
@widget_set.get_tags rescue []
end
def front_end(&block) #setter for front_end from init
@front_end_app_pages = FrontendUtility::AppPageSet.new(@name,@key,&block)
end
@@ -145,14 +143,30 @@ module OrbitApp
define_method(field){|var| instance_variable_set( "@" + field, var)}
end
def authorizable
@is_authorizable = true
end
def categorizable
@has_category = true
end
def taggable
@has_tag = true
end
def get_has_category
@has_category.nil? ? false : true
end
def get_has_tags
@has_tag.nil? ? false : true
end
def get_is_authorizable
@is_authorizable.nil? ? false : true
end
end # of class DataSheet
end
+14 -1
View File
@@ -48,6 +48,7 @@ module OrbitApp
@active_for_controllers = []
@active_for_object_auth = []
@active_for_app_auth = []
@active_for_tag = []
@head_link = ""
@app_base_path = ''
@module_app_key = key
@@ -63,11 +64,19 @@ module OrbitApp
def get_sidebar_order!
@sidebar_order = (get_module_app.sidebar_order rescue 0)
end
def get_icon_class
@icon_class
end
def get_module_app
@get_module_app.call
end
def get_module_app_key
@module_app_key
end
def head_label_i18n(var,options ={})
@head_label = var
@icon_class = options[:icon_class]
@@ -139,6 +148,8 @@ module OrbitApp
@active_for_action = options[:active_for_action] || []
@active_for_object_auth = options[:active_for_object_auth] || []
@active_for_app_auth = options[:active_for_app_auth] || []
@active_for_category = options[:active_for_category] || []
@active_for_tag = options[:active_for_tag] || []
@module_app_key = options[:module_app_key]
@get_module_app = options[:get_module_app]
end
@@ -169,7 +180,9 @@ module OrbitApp
for_action = @active_for_action.blank? ? false : active_for_action?
for_app_auth = @active_for_app_auth.blank? ? false : active_for_app_auth?
for_ob_auth = @active_for_object_auth.blank? ? false : active_for_ob_auths?
for_action || for_app_auth || for_ob_auth
for_category = @active_for_category.blank? ? false : active_for_category?
for_tag = @active_for_tag.blank? ? false : active_for_tag?
for_action || for_app_auth || for_ob_auth || for_tag
end
def active_for_action?