drg_cms 0.6.0.8 → 0.6.1.5

data/app/helpers/dc_application_helper.rb

@@ -1,4 +1,3 @@
-#coding: utf-8
 #--
 # Copyright (c) 2012+ Damjan Rems
 #
@@ -95,17 +94,17 @@ end
 ############################################################################
 def dc_render(renderer, opts={})
   return dc_render_design_part(renderer[:part]) if renderer.class == Hash
-# 
+
   opts[:edit_mode]  = session[:edit_mode] 
   opts[:editparams] = {}
   
   opts = @options.merge(opts) # merge options with parameters passed on site, page, design ...
   opts.symbolize_keys!        # this makes lots of things easier
-# Create renderer object
+  # Create renderer object
   klass = renderer.to_s.downcase
   klass += '_renderer' unless klass.match('_renderer') #
   obj = Kernel.const_get(klass.classify, Class.new).new(self, opts) rescue nil
-# 
+
   if obj
     html = obj.render_html
     @css  << obj.render_css.to_s
@@ -133,7 +132,7 @@ def dc_replace_in_design(opts={})
   design = opts[:piece] ? DcPiece.find(name: opts[:piece]).script : dc_get_site.design
   layout = opts[:layout] || (dc_get_site.site_layout.size > 2 ? dc_get_site.site_layout : nil)
   if opts[:replace]
-# replace more than one part of code
+    # replace more than one part of code
     if opts[:replace].class == Array
       0.upto(opts[:replace].size - 1) {|i| design.sub!(opts[:replace][i], opts[:with][i])}
     else
@@ -179,13 +178,12 @@ end
 # 
 # This helper is replacement dc_render_from_site method which will soon be deprecated. 
 ########################################################################
-def dc_render_design_part(part) 
-  
+def dc_render_design_part(part)
   case
   when part.nil? then logger.error('ERROR dc_render_design_part! part is NIL !'); ''
-# Send as array. Part may be defined with options on page. First element has
-# name of element which defines what to do. If not defined default behaviour is 
-# called. That is what is defined in second part of array.
+  # Send as array. Part may be defined with options on page. First element has
+  # name of element which defines what to do. If not defined default behaviour is
+  # called. That is what is defined in second part of array.
   when part.class == Array then
     if @options.dig(:settings, part.first)
       #TODO to be defined 
@@ -196,9 +194,9 @@ def dc_render_design_part(part)
   when part.class == Proc then
     result = part.call
     result.class == Array ? result.first : result
-# Send as string. Evaluate content of string    
+  # Send as string. Evaluate content of string
   when part.class == String then eval part
-# For future maybe. Just call objects to_s method.
+  # For future maybe. Just call objects to_s method.
   else
     part.to_s
   end.html_safe
@@ -231,9 +229,9 @@ end
 ########################################################################
 # Helper for rendering top CMS menu when in editing mode
 ########################################################################
-def dc_page_top()
-  if @design and !@design.rails_view.blank?
-# Evaluate parameters in design body    
+def dc_page_top
+  if @design && @design.rails_view.present?
+    # Evaluate parameters in design body
     eval(@design.body)
   end
   session[:edit_mode] > 0 ? render(partial: 'cmsedit/edit_stuff') : ''
@@ -243,8 +241,8 @@ end
 # Helper for adding additional css and javascript code added by documents
 # and renderers during page rendering.
 ########################################################################
-def dc_page_bottom()
-  %Q[<style type="text/css">#{@css}</style>#{javascript_tag @js}].html_safe
+def dc_page_bottom
+  %(<style type="text/css">#{@css}</style>#{javascript_tag @js}).html_safe
 end
 
 ############################################################################
@@ -258,10 +256,16 @@ end
 # Returns:
 # String. HTML code for title.
 ############################################################################
-def dc_table_title(text, result_set=nil)
-  c = %Q[<div class="dc-title">#{text}]
+def dc_table_title(text, result_set = nil)
+  c = %(<div class="dc-title">#{text})
+  # help button
+  type = result_set.nil? ? 'form' : 'index'
+  form_name = params[:form_name] || params[:table]
+  url = url_for(controller: :dc_common, action: :help, type: type, form_name: form_name)
+  c << %(<div class="dc-help dc-link-ajax" data-url=#{url}>#{fa_icon('question-circle')}</div>)
+
   if result_set and result_set.respond_to?(:current_page)
-    c << %Q[<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no', filter: nil})}</div>]
+    c << %(<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no', filter: nil})}</div>)
   end
   c << '<div style="clear: both;"></div></div>'
   c.html_safe
@@ -273,21 +277,21 @@ end
 # Returns:
 # String. HTML code for title.
 ############################################################################
-def dc_edit_title()
+def dc_edit_title
   session[:form_processing] = "form:title:"
   title = @form['form']['title']
-# defined as form:title:edit
+  # defined as form:title:edit
   if title and title['edit'] and !@form['readonly']
     t( title['edit'], title['edit'] )
   elsif title and title['show'] and @form['readonly']
     t( title['show'], title['show'] )
   else
-# concatenate title 
+    # concatenate title
     c = (@form['readonly'] ? t('drgcms.show') : t('drgcms.edit')) + " : "
-    c << (@form['title'] ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
+    c << (@form['title'].class == String ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
     title = (title and title['field']) ? title['field'] : @form['form']['edit_title']
     dc_deprecate('form:edit_title will be deprecated. Use form:title:field instead.') if @form['form']['edit_title']
-#
+
     c << "#{@record[ title ]} : " if title and @record.respond_to?(title)
     c << @record.id if @record
   end
@@ -303,15 +307,11 @@ end
 def dc_new_title()
   session[:form_processing] = "form:title:"
   title = @form['form']['title']
-# defined as form:title:new
+  # defined as form:title:new
   if title and title['new']
     t( title['new'], title['new'] )
   else
-    if @form['table'] == 'dc_dummy'
-      dc_deprecate('dc_dummy will be deprecated. Use dc_memory instead.')
-      @form['table'] = 'dc_memory'
-    end
-# in memory variables    
+    # in memory structures
     if @form['table'] == 'dc_memory'
       t( @form['title'], @form['title'] )
     else
@@ -360,7 +360,8 @@ end
 # Returns icon code if icon is specified
 ############################################################################
 def dc_icon_for_link(icon)
-  return nil unless icon
+  return nil if icon.nil?
+
   if icon.match(/\./)
     _origin.image_tag(icon, class: 'dc-link-img dc-animate')
   elsif icon.match('<i')
@@ -433,22 +434,13 @@ end
 # Therefore it is very unwise to use non ascii chars for table (collection) names.
 # 
 # Parameters: 
-# [string] String. String to be converted into decamelized string.
+# [Object] model_string. String or model to be converted into decamelized string.
 # 
 # Returns:
 # String. Decamelized string.
 ########################################################################
-def decamelize_type(string)
-  return nil if string.nil?
-  r = ''
-  string.to_s.each_char do |c|
-    r << case 
-      when r.size == 0     then c.downcase
-      when c.downcase != c then '_' + c.downcase
-      else c      
-    end
-  end
-  r
+def decamelize_type(model_string)
+  model_string ? model_string.to_s.underscore : nil
 end
 
 ####################################################################
@@ -462,20 +454,49 @@ end
 # String. HTML code formatted for display.
 ####################################################################
 def dc_error_messages_for(doc)
-  return '' unless doc and doc.errors.any?
-  msgs = ''
-  doc.errors.each do |attribute, errors_array|
-    label = t("helpers.label.#{decamelize_type(doc.class)}.#{attribute}", attribute)
-    msgs << "<li>#{label} : #{errors_array}</li>"
+  return '' unless doc && doc.errors.any?
+
+  msgs = doc.errors.inject('') do |r, error|
+    label = t("helpers.label.#{decamelize_type(doc.class)}.#{error.attribute}", error.attribute)
+    r << "<li>#{label} : #{error.message}</li>"
   end
-  
-c = <<eot
+
+  html = <<eot
 <div class="dc-form-error"> 
   <h2>#{t('drgcms.errors_no')} #{doc.errors.size}</h2>  
   <ul>#{msgs}</ul>  
 </div>
 eot
-  c.html_safe
+  html.html_safe
+end
+
+####################################################################
+# Returns warning messages if any set in a model.
+#
+# When warnings array is added to model its content can be written on top of the form.
+#
+# Parameters:
+# [doc] Document. Document record which will be checked for errors.
+#
+# Returns:
+# String. HTML code formatted for display.
+####################################################################
+def dc_warning_messages_for(doc)
+  return ''
+  return '' unless doc && doc.respond_to?(:warnings)
+
+  msgs = doc.warnings.inject('') do |r, error|
+    label = t("helpers.label.#{decamelize_type(doc.class)}.#{error.attribute}", error.attribute)
+    msgs << "<li>#{label} : #{error.message}</li>"
+  end
+
+  html = <<eot
+<div class="dc-form-warning"> 
+  <h2>#{t('drgcms.warnings_no')} #{doc.warnings.size}</h2>  
+  <ul>#{msgs}</ul>  
+</div>
+eot
+  html.html_safe
 end
 
 ####################################################################
@@ -549,14 +570,14 @@ end
 # Create edit link with edit picture. Subroutine of dc_page_edit_menu.
 ####################################################################
 def dc_link_menu_tag(title) #:nodoc:
-  html = %Q[
+  html = %(
 <dl>
   <dt><div class='drgcms_popmenu' href="#">
     #{_origin.fa_icon('file-text-o lg', class: 'dc-inline-link', title: title)}
   </div></dt>
   <dd>
     <ul class=' div-hidden drgcms_popmenu_class'>
-]
+)
 
   yield html
   html << "</ul></dd></dl>"
@@ -590,10 +611,11 @@ end
 # Returns: 
 # String. HTML code required for manipulation of currently processed document.
 ########################################################################
-def dc_page_edit_menu(opts=@opts)
+def dc_page_edit_menu(opts = @opts)
   opts[:edit_mode] ||= _origin.session[:edit_mode]
   return '' if opts[:edit_mode] < 2
-# save some data to cookie. This can not go to session.
+
+  # save some data to cookie. This can not go to session.
   page  = opts[:page] || @page
   table = _origin.site.page_class.underscore
   kukis = { "#{table}.dc_design_id" => page.dc_design_id,
@@ -610,11 +632,9 @@ def dc_page_edit_menu(opts=@opts)
     opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_class.underscore, form_name: opts[:form_name], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
-#    opts[:editparams][:edit_only] = nil
     opts[:editparams].merge!( edit_only: nil, 'icon' => 'pencil' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_advanced') )
     
-#    opts[:editparams][:action] = 'new'
     opts[:editparams].merge!( action: 'new', 'icon' => 'plus' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_page') )
 
@@ -636,8 +656,7 @@ end
 #      type: text_with_select
 #      eval: 'dc_page_class.all_pages_for_site(@parent.dc_get_site)'
 ########################################################################
-def dc_page_class()
-#  dc_get_site.page_class.classify.constantize  
+def dc_page_class
   dc_get_site.page_klass
 end
 
@@ -652,7 +671,7 @@ end
 #      type: tree_view
 #      eval: 'dc_menu_class.all_menus_for_site(@parent.dc_get_site)'
 ########################################################################
-def dc_menu_class()
+def dc_menu_class
   dc_get_site.menu_class.classify.constantize
 end
 
@@ -666,23 +685,20 @@ end
 # Returns:
 # DCSite. Site document.
 ####################################################################
-def dc_get_site()
+def dc_get_site
   return @site if @site # already cached
-#
+
   req = _origin.request.url # different when called from renderer
   uri  = URI.parse(req)
   @site = DcSite.find_by(name: uri.host)
-# Site can be aliased
-  if @site and !@site.alias_for.blank?
-    @site = DcSite.find_by(name: @site.alias_for)
-  end
-# Development environment. Check if site with name test exists and use 
-# alias_for field as pointer to real site name.
-  if @site.nil? and ENV["RAILS_ENV"] != 'production'
+  # Site can be aliased
+  @site = DcSite.find_by(name: @site.alias_for) if @site&.alias_for.present?
+  # Development. If site with name test exists use alias_for field as pointer to real site data
+  if @site.nil? && ENV["RAILS_ENV"] != 'production'
     @site = DcSite.find_by(name: 'test')
     @site = DcSite.find_by(name: @site.alias_for) if @site
   end 
-  @site = nil if @site and !@site.active # site is disabled
+  @site = nil if @site && !@site.active # site is disabled
   @site
 end
 
@@ -698,9 +714,9 @@ end
 #    html:
 #      include_blank: true      
 ############################################################################
-def dc_choices4_site_policies()
+def dc_choices4_site_policies
   site = dc_get_site()
-  site.dc_policies.all.inject([]) { |r, policy| r << [ policy.name, policy.id] if policy.active }
+  site.dc_policies.where(active: true).order_by(name: 1).map { |policy| [ policy.name, policy.id] }
 end
 
 ############################################################################
@@ -721,7 +737,7 @@ def dc_choices4_all_collections
   DrgCms.paths(:forms).reverse.each do |path|
     filename = "#{path}/cms_menu.yml"
     next unless File.exist?(filename)
-#
+
     menu = YAML.load_file(filename) rescue nil      # load menu
     next if menu.nil? or !menu['menu']              # not menu or error
     menu['menu'].each do |section|
@@ -748,14 +764,14 @@ def forms_merge(hash1, hash2) #:nodoc:
     end
     target[key] = hash2[key] == '/' ? nil :  hash2[key]
   end
-# delete keys with nil value  
-  target.delete_if{ |k,v| v.nil? }
+  # delete keys with nil value
+  target.delete_if{ |k, v| v.nil? }
 end
 
 ##########################################################################
 # Returns choices for creating collection edit select field on CMS top menu.
 ##########################################################################
-def dc_choices4_cmsmenu()
+def dc_choices4_cmsmenu
   menus = {}
   DrgCms.paths(:forms).reverse.each do |path|
     filename = "#{path}/cms_menu.yml"
@@ -764,7 +780,7 @@ def dc_choices4_cmsmenu()
     next if menu.nil? or !menu['menu']              # not menu or error
     menus = forms_merge(menu['menu'], menus)        # ignore top level part
  end
-#
+
   html = '<ul>'
   menus.to_a.sort.each do |index, menu|    # sort menus, result is array of sorted hashes
     next unless menu['caption']
@@ -829,9 +845,11 @@ def dc_choices4(model, name, id='_id', options = {})
     sites << nil if param == :with_nil 
     qry   = qry.in(dc_site_id: sites) if sites
   end
-  qry   = qry.and(active: true) if model.method_defined?(:active)
-  choices = qry.inject([]) {|result,e| result << [ e[name], e[id] ]}
-  choices.sort_alphabetical_by(&:first) # use UTF-8 sort
+  qry = qry.and(active: true) if model.method_defined?(:active)
+  qry = qry.order_by(name => 1).collation(locale: I18n.locale.to_s)
+  #choices = qry.inject([]) {|result,e| result << [ e[name], e[id] ]}
+  #choices.sort_alphabetical_by(&:first) # use UTF-8 sort
+  qry.map { |e| [e[name], e[id]] }
 end
 
 ############################################################################
@@ -892,35 +910,35 @@ end
 ############################################################################
 def dc_user_can_view(ctrl, policy_id)
   policy_id = policy_id.policy_id if policy_id and policy_id.respond_to?(:policy_id)
-# Eventualy object without policy_id will be checked. This is to prevent error
+  # Eventualy object without policy_id will be checked. This is to prevent error
   policy_id = nil unless policy_id.class == BSON::ObjectId
-#
+
   site = ctrl.site
   policies = if site.inherit_policy.blank? 
     site.dc_policies
   else
     Mongoid::QueryCache.cache { DcSite.find(site.inherit_policy) }.dc_policies
   end
-# permission defined by default policy
+  # permission defined by default policy
   default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
   return false, 'Default access policy not found for the site!' unless default_policy
-#  
+
   permissions = {}
   default_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
-# update permissions with defined policy 
+  # update permissions with defined policy
   part_policy = nil
   if policy_id
     part_policy = Mongoid::QueryCache.cache { policies.find(policy_id) }
     return false, 'Access policy not found for part!' unless part_policy
     part_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
   end
-# apply guest role if no roles defined
+  # apply guest role if no roles defined
   if ctrl.session[:user_roles].nil?
     role = Mongoid::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
     return false, 'System guest role not defined!' unless role
     ctrl.session[:user_roles] = [role.id]
   end
-# Check if user has any role that allows him to view part
+  # Check if user has any role that allows him to view part
   can_view, msg = false,''
   ctrl.session[:user_roles].each do |role|
     next unless permissions[role]          # role not yet defined. Will die in next line.
@@ -956,10 +974,10 @@ def dc_user_has_role( role, user=nil, roles=nil )
   roles = _origin.session[:user_roles] if roles.nil?
   user  = _origin.session[:user_id] if user.nil?
   return false if user.nil? or roles.nil?
-#  
+
   role = DcPolicyRole.get_role(role)
   return false if role.nil?
-# role is included in roles array
+  # role is included in roles array
   roles.include?(role._id)
 end
 
@@ -998,6 +1016,7 @@ end
 ############################################################################
 def dc_limit_string(string, size)
   return string if string.size < size
+
   string = string[0,size]
   string.chop! until (string[-1,1] == ' ' or string == '')
   string << '...'
@@ -1025,10 +1044,11 @@ def dc_big_table(key)
   bt = DcBigTable.find_by(key: key, site: dc_get_site._id, active: true)
   bt = DcBigTable.find_by(key: key, site: nil, active: true) if bt.nil?
   return ret if bt.nil? 
-# 
+
   locale = I18n.locale.to_s
   bt.dc_big_table_values.each do |v|   # iterate each value
     next unless v.active
+
     desc = ''
     v.dc_big_table_locales.each do |l| # iterate each locale
       if l.locale == locale
@@ -1083,12 +1103,13 @@ def dc_iframe_edit(table, opts={})
 end
 
 ########################################################################
-# Will return value from internal DRG variables.
-# This objects can be params, session, ...
+# Will return value from Rails and DRG internal objects.
+# This objects can be params, session, record, site, page
 # 
 # Parameters:
-# [object] String: Internal object holding variable. Current values can be session, params, site, page, class
+# [object] String: Internal object holding variable. Possible values are session, params, record, site, page, class
 # [var_name] String[symbol]: Variable name (:user_name, 'user_id', ...)
+# [current_document] Object: If passed and object is 'record' then it will be used for retrieving data.
 # 
 # Example:
 #    # called when constructing iframe for display
@@ -1100,26 +1121,28 @@ end
 #    
 # 
 # Returns:
-# Value of variable or nil when not found
+# Value of variable or error when not found
 ########################################################################
-def dc_internal_var(object, var_name)
+def dc_internal_var(object, var_name, current_document = nil)
   begin
     case
-      when object == 'session' then _origin.session[var_name]
-      when object == 'params'  then _origin.params[var_name]
-      when object == 'site'    then _origin.dc_get_site.send(var_name)
-      when object == 'page'    then _origin.page.send(var_name)
-      when object == 'record'  then _origin.record.send(var_name)
-      when object == 'class'   then
-        clas, method_name = var_name.split('.')
-        klas = clas.classify.constantize
-        # call method. Error will be cought below.
-        klas.send(method_name)
-      else
-        'VARIABLE: UNKNOWN OBJECT'
+    when object == 'session' then _origin.session[var_name]
+    when object == 'params'  then _origin.params[var_name]
+    when object == 'site'    then _origin.dc_get_site.send(var_name)
+    when object == 'page'    then _origin.page.send(var_name)
+    when object == 'record'  then
+      current_document ? current_document.send(var_name) : _origin.record.send(var_name)
+    when object == 'class'   then
+      clas, method_name = var_name.split('.')
+      klas = clas.classify.constantize
+      # call method. Error will be caught below.
+      klas.send(method_name)
+    else
+      'VARIABLE: UNKNOWN OBJECT'
     end
   rescue Exception => e
-    logger.error "Method dc_internal_var. Runtime error. #{e.message}"
+    Rails.logger.debug "\ndc_internal_var. Runtime error. #{e.message}\n"
+    Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
     'VARIABLE: ERROR'
   end
 end

data/app/models/concerns/dc_page_concern.rb

@@ -1,4 +1,3 @@
-#coding: utf-8
 #--
 # Copyright (c) 2012+ Damjan Rems
 #
@@ -37,11 +36,12 @@ field :subject_link, type: String,  default: ''
 field :alt_link,     type: String,  default: ''
 field :sub_subject,  type: String,  default: ''
 field :picture,      type: String   
-field :gallery,      type: Boolean, default: false   
+field :gallery,      type: Mongoid::Boolean, default: false
 field :body,         type: String,  default: ''
 field :css,          type: String,  default: ''
 field :script,       type: String,  default: ''
 field :params,       type: String
+field :div_class,    type: String
 field :menu_id,      type: String
 field :author_id,    type: BSON::ObjectId
 field :dc_poll_id,   type: BSON::ObjectId
@@ -51,7 +51,7 @@ field :user_name,    type: String
 field :valid_from,   type: DateTime
 field :valid_to,     type: DateTime
 field :comments,     type: Integer, default: 1  # 0 => not allowed, 1 => allowed
-field :active,       type: Boolean, default: true 
+field :active,       type: Mongoid::Boolean, default: true
 field :created_by,   type: BSON::ObjectId
 field :updated_by,   type: BSON::ObjectId
 field :kats,         type: Array         # Categories
@@ -83,6 +83,16 @@ before_save :do_before_save
 
 validates :publish_date, presence: true
 validate  :validate_images_alt_present
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_page)
+end
   
 ######################################################################
 # Will return subject_link. Field name link should be common for all documents
@@ -94,7 +104,7 @@ end
    
 ######################################################################
 # Will return validation error if all images in body field do not have 
-# alt attribute pressent.
+# alt attribute present.
 ######################################################################
 def validate_images_alt_present
   errors.add('body', I18n.t('drgcms.img_alt_not_present')) unless DcPage.images_alt_present?(self.body)

data/app/models/concerns/dc_piece_concern.rb

@@ -45,7 +45,7 @@ module DcPieceConcern
   field :div_id,        type: String
   field :site_id,       type: BSON::ObjectId
   field :order,         type: Integer, default: 0
-  field :active,        type: Boolean, default: true  
+  field :active,        type: Mongoid::Boolean, default: true
   field :valid_from,    type: DateTime
   field :valid_to,      type: DateTime
   

data/app/models/concerns/dc_policy_rule_concern.rb

@@ -25,17 +25,20 @@
 # ActiveSupport::Concern definition for DcPolicyRule class. 
 #########################################################################
 module DcPolicyRuleConcern
-  extend ActiveSupport::Concern
-  included do
+extend ActiveSupport::Concern
+included do
 
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  belongs_to :dc_policy_role
+belongs_to :dc_policy_role
 
-  field      :permission,    type: Integer, default: 0
+field      :permission,    type: Integer, default: 0
 
-  embedded_in :policy_rules, polymorphic: true 
+embedded_in :policy_rules, polymorphic: true
+
+after_save :cache_clear
+after_destroy :cache_clear
 
 #########################################################################
 # Returns values for permissions ready to be used in select field.
@@ -50,7 +53,7 @@ def self.values_for_permissions
   key = 'helpers.label.dc_policy_rule.choices4_permission'
   c = I18n.t(key)  
   c = I18n.t(key, locale: 'en') if c.class == Hash or c.match( 'translation missing' )
-  c.split(',').inject([]) {|r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
+  c.split(',').inject([]) { |r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
 end
 
 #########################################################################
@@ -74,5 +77,14 @@ def self.permission_name_for_value(value)
   'error'
 end
 
+private
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  _parent.send(:cache_clear) if _parent.respond_to?(:cache_clear)
+end
+
 end
 end