drg_cms 0.6.0.6 → 0.6.0.8

data/app/helpers/dc_application_helper.rb

@@ -261,7 +261,7 @@ end
 def dc_table_title(text, result_set=nil)
   c = %Q[<div class="dc-title">#{text}]
   if result_set and result_set.respond_to?(:current_page)
-    c << %Q[<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no'})}</div>]
+    c << %Q[<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
@@ -352,7 +352,8 @@ def dc_submit_tag(caption, icon, parms, rest={})
     end
   end
   html = icon_image || ''
-  html << submit_tag(t(caption, caption), parms)
+  #html << submit_tag(t(caption, caption), parms)
+  %Q[<button type="submit" class="dc-submit" name="commit" value="#{t(caption, caption)}">#{icon_image} #{t(caption, caption)}</button>].html_safe
 end
 
 ############################################################################
@@ -377,7 +378,7 @@ def dc_link_to(caption, icon, parms, rest={})
   if parms.class == Hash
     parms.stringify_keys!
     rest.stringify_keys!
-    rest['class'] = rest['class'].to_s + ' dc-animate'
+    rest['class'] = rest['class'].to_s + ' dc-animate' unless rest['class'].to_s.match('dc-animate')
     rest['target'] ||=  parms.delete('target')
     parms['controller'] ||= 'cmsedit'
     icon_pos = parms.delete('icon_pos') || 'first'
@@ -655,226 +656,6 @@ def dc_menu_class()
   dc_get_site.menu_class.classify.constantize
 end
 
-
-####################################################################
-# Wrapper for i18 t method, with some spice added. If translation is not found English
-# translation value will be returned. And if still not found default value will be returned if passed.
-# 
-# Parameters:
-# [key] String. String to be translated into locale.
-# [default] String. Value returned if translation is not found.
-# 
-# Example:
-#    t('translate.this','Enter text for ....')
-# 
-# Returns: 
-# String. Translated text. 
-####################################################################
-def t(key, default=nil)
-  c = I18n.t(key)
-  if c.class == Hash or c.match( 'translation missing' )
-    c = I18n.t(key, locale: 'en') 
-# Still not found. Return default if set
-    if c.class == Hash or c.match( 'translation missing' )
-      c = default.nil? ? key : default
-    end
-  end
-  c
-end
-
-####################################################################
-# Returns table (collection) name translation for usage in dialog title. Tablename 
-# title is provided by helpers.label.table_name.tabletitle locale.
-# 
-# Parameters:
-# [tablename] String. Table (collection) name to be translated.
-# [default] String. Value returned if translation is not found.
-# 
-# Returns: 
-# String. Translated text. 
-####################################################################
-def t_tablename(tablename, default=nil)
-  t('helpers.label.' + tablename + '.tabletitle', default || tablename)
-end
-
-############################################################################
-# Returns label for field translated to current locale for usage on data entry form.
-# Translation is provided by lang.helpers.label.table_name.field_name locale. If
-# translation is not found method will capitalize field_name and replace '_' with ' '.
-############################################################################
-def t_name(field_name, default='')
-  c = t("helpers.label.#{@form['table']}.#{field_name}", default)
-  c = field_name.capitalize.gsub('_',' ') if c.match( 'translation missing' )
-  c
-end
-
-############################################################################
-# When select field is used on form options for select can be provided by 
-# helpers.label.table_name.choices4_name locale. This is how select
-# field options are translated. Method returns selected choice translated
-# to current locale. 
-# 
-# Parameters:
-# [model] String. Table (collection) model name (lowercase).
-# [field] String. Field name used.
-# [value] String. Value of field which translation will be returned.
-# 
-# Example:
-#    # usage in program. Choice values for state are 'Deactivated:0,Active:1,Waiting:2'
-#    dc_name4_value('dc_user', 'state', @record.active )
-#
-#    # usage in form
-#    columns:
-#      2: 
-#        name: state
-#        eval: dc_name4_value dc_user, state
-#        
-# Returns: 
-# String. Descriptive text (translated) for selected choice value.
-############################################################################
-def dc_name4_value(model, field, value)
-  return '' if value.nil?
-  c = t('helpers.label.' + model + '.choices4_' + field )
-  a = c.chomp.split(',').inject([]) {|r,v| r << v.split(':') }
-  a.each {|e| return e.first if e.last.to_s == value.to_s }
-  ''
-end
-
-############################################################################
-# Return choices for field in model if choices are defined in localization text.
-# 
-# Parameters:
-# [model] String. Table (collection) model name (lowercase).
-# [field] String. Field name used.
-# 
-# Example:
-#    dc_choices4_field('dc_user', 'state' )
-#        
-# Returns: 
-# Array. Choices for select input field
-############################################################################
-def dc_choices4_field(model, field)
-  c = t('helpers.label.' + model + '.choices4_' + field )
-  return ['error'] if c.match( 'translation missing' )
-  c.chomp.split(',').inject([]) {|r,v| r << v.split(':') }
-end
-
-############################################################################
-# Will return descriptive text for id key when field in one table (collection) has belongs_to 
-# relation to other table.
-# 
-# Parameters:
-# [model] String. Table (collection) model name (lowercase).
-# [field] String. Field name holding the value of descriptive text.
-# [field_name] String. ID field name. This is by default id, but can be any other 
-# (preferred unique) field.
-# [value] Value of id_field. Usually a BSON Key but can be any other data type.
-# 
-# Example:
-#    # usage in program.
-#    dc_name4_id('dc_user', 'name', nil, dc_page.created_by)
-#
-#    # usage in form
-#    columns:
-#      2: 
-#        name: site_id
-#        eval: dc_name4_id,site,name
-#    # username is saved to document instead of user.id field
-#      5: 
-#        name: user
-#        eval: dc_name4_id,dc_user,name,username
-# 
-# Returns: 
-# String. Name (descriptive value) for specified key in table.
-############################################################################
-def dc_name4_id(model, field, field_name, id=nil)
-  return '' if id.nil?
-  field_name = (field_name || 'id').strip.to_sym
-  field = field.strip.to_sym
-  
-  model = model.strip.classify.constantize if model.class == String
-  rec = Mongoid::QueryCache.cache { model.find_by(field_name => id) }
-  rec.nil? ? '' : (rec.send(field) rescue 'not defined')
-end
-
-############################################################################
-# Return html code for icon presenting boolean value. Icon is a picture of checked or unchecked box.
-# 
-# Parameters:
-# [value] Boolean.  
-# 
-# Example:
-#    # usage from program
-#    dc_icon4_boolean(some_value)
-#
-#    # usage from form description
-#    columns:
-#      10: 
-#        name: active
-#        eval: dc_icon4_boolean
-############################################################################
-def dc_icon4_boolean(value=false)
-  dc_dont?(value, true) ? fa_icon('square-o lg') : fa_icon('check-square-o lg') 
-end
-
-############################################################################
-# Returns html code for displaying date/time formatted by strftime. Will return '' if value is nil.
-# 
-# Parameters:
-# [value] Date/DateTime/Time.  
-# [format] String. strftime format mask. Defaults to locale's default format.
-############################################################################
-def dc_format_date_time(value, format=nil)
-  return '' if value.nil?
-  format ||= value.class == Date ? t('date.formats.default') : t('time.formats.default')
-  value.strftime(format)
-end
-
-####################################################################
-#
-####################################################################
-def dc_date_time(value, format) #:nodoc:
-  dc_deprecate 'dc_date_time will be deprecated! Use dc_format_date_time instead.'
-  dc_format_date_time(value, format)
-end
-
-############################################################################
-# Returns html code for displaying formatted number.
-# 
-# Parameters:
-# [value] Numeric number.  
-# [decimals] Integer. Number of decimals
-# [separator] String. Decimals separator
-# [delimiter] String. Thousands delimiter.
-# [currency] String. Currency symbol if applied to result string.
-############################################################################
-def dc_format_number(value=0, decimals=nil, separator=nil, delimiter=nil, currency=nil)
-  decimals  ||=  I18n.t('number.currency.format.precision')
-  separator ||= I18n.t('number.currency.format.separator')
-  separator   = '' if decimals == 0
-  delimiter ||= I18n.t('number.currency.format.delimiter')
-  whole, dec = value.to_s.split('.')
-  whole = '0' if whole.blank?
-# remove and remember sign  
-  sign = ''
-  if whole[0] == '-'
-    whole.delete_prefix!('-')
-    sign  << '-'
-  end
-# format decimals
-  dec ||= '0'
-  dec = dec[0,decimals]
-  while dec.size < decimals do dec += '0' end
-# slice whole on chunks of 3
-  ar = []
-  while whole.size > 0 do 
-    n = whole.size >=3 ? 3 : whole.size 
-    ar << whole.slice!(n*-1,n)
-  end
-# put it all back and format
-  "#{sign}#{ar.reverse.join(delimiter)}#{separator}#{dec}" 
-end
-
 ####################################################################
 # Parse site name from url and return dc_site document. Site document will be cached in
 # @site variable.
@@ -1049,9 +830,6 @@ def dc_choices4(model, name, id='_id', options = {})
     qry   = qry.in(dc_site_id: sites) if sites
   end
   qry   = qry.and(active: true) if model.method_defined?(:active)
-#  qry   = qry.sort(name => 1) 
-#  choices = []
-#  qry.each {|v| choices << [ v[name], v[id] ] }
   choices = qry.inject([]) {|result,e| result << [ e[name], e[id] ]}
   choices.sort_alphabetical_by(&:first) # use UTF-8 sort
 end
@@ -1200,7 +978,8 @@ end
 ####################################################################
 def dc_dont?(what, default=false)
   return default if what.nil?
-  %w(0 no - false none).include?(what.to_s.downcase.strip)
+
+  %w(0 n - no none false).include?(what.to_s.downcase.strip)
 end
 
 ############################################################################
@@ -1308,14 +1087,17 @@ end
 # This objects can be params, session, ...
 # 
 # Parameters:
-# [object] String: Internal object holding variable. Current values can be session, params, site, page
+# [object] String: Internal object holding variable. Current values can be session, params, site, page, class
 # [var_name] String[symbol]: Variable name (:user_name, 'user_id', ...)
 # 
 # Example:
 #    # called when constructing iframe for display
-#    dc_internal_var(session, :user_id)
-#    dc_internal_var(params, :some_external_parameter)
-#    dc_internal_var(site, :name)
+#    dc_internal_var('session', :user_id)
+#    dc_internal_var('params', :some_external_parameter)
+#    dc_internal_var('site', :name)
+#    # or even
+#    dc_internal_var('class', 'ClassName.class_method_name')
+#    
 # 
 # Returns:
 # Value of variable or nil when not found
@@ -1328,8 +1110,13 @@ def dc_internal_var(object, 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)
-    else
-      'VARIABLE: UNKNOWN OBJECT'
+      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'
     end
   rescue Exception => e
     logger.error "Method dc_internal_var. Runtime error. #{e.message}"
@@ -1337,7 +1124,6 @@ def dc_internal_var(object, var_name)
   end
 end
 
-
 ########################################################################
 # Will return whole path to document if document is embedded in another document.
 # 

data/app/models/concerns/dc_site_concern.rb

@@ -86,7 +86,7 @@ end
 # Returns class object of menu collection name
 ########################################################################
 def menu_klass()
-  (self.menu_class.blank? ? 'DcMenu' : self.menu_class).classify.constantize
+  (menu_class.blank? ? 'DcMenu' : menu_class).classify.constantize
 end
 
 ########################################################################
@@ -106,5 +106,16 @@ def self.choices4_policies
   [['a','b']]
 end
 
+########################################################################
+# Return choices for selecting policies for the site
+########################################################################
+def self.choices_for_menu(menu_class)
+  return [] if menu_class.blank?
+  menu = menu_class.classify.constantize
+  menu.where(active: true).inject([]) do |r, a_menu|
+    r << [a_menu.description, a_menu.id]
+  end
+end
+
 end  
 end

data/app/models/dc_filter.rb

@@ -110,35 +110,37 @@ def self.get_filter_field(parent)
   return '' if parent.session[ parent.form['table'] ].nil?
   filter = parent.session[ parent.form['table'] ][:filter]
   return '' if filter.nil?
-#
+
   filter = YAML.load(filter) rescue nil 
   return '' if filter.nil?
-#
+
   field = get_field_form_definition(filter['field'], parent)
   return '' if field.nil? and filter['input'].nil?
   field = {} if field.nil?
-# If field has choices available in labels, use them. This is most likely select input field.
+  # If field has choices available in labels, use them. This is most likely select input field.
   if field['name']
     choices = parent.t('helpers.label.' + parent.form['table'] + '.choices4_' + field['name'] )
     unless choices.match( 'translation missing' ) or choices.match('helpers.label')
       field['choices'] = choices
     end
   end
-# field redefined with input keyword. Name must start with _
+  # field redefined with input keyword. Name must start with _
   field['name']     = '_filter_field'
   field['type']     = filter['input'] if filter['input'].to_s.size > 5
   field['type']   ||= 'text_field'
   field['readonly'] = false   # must be
   field['html']   ||= {} 
   field['html']['size']  = 20
-# Start with last entered value
-  field['html']['value'] = filter['value'] unless filter['value'] == '#NIL'
+  # Start with last entered value
+  field['html']['value']    = filter['value'] unless filter['value'] == '#NIL'
   field['html']['selected'] = field['html']['value'] # for select field
-# url for filter ON action
+  # url for filter ON action
   field['html']['data-url'] = parent.url_for(
     controller: 'cmsedit',action: :index, filter: 'on',
-    table: parent.form['table'], form_name: parent.form['form_name'])
+    table: parent.form['table'], form_name: parent.params['form_name'])
   url = field['html']['data-url']
+  # remove if present
+  field['with_new'] = nil if field['with_new']
 # create input field object
   klas_string = field['type'].camelize
   klas = DrgcmsFormFields::const_get(klas_string) rescue nil

data/app/models/dc_permission.rb

@@ -85,4 +85,34 @@ def self.values_for_permissions #:nodoc:
   [['NO_ACCESS',0],['CAN_VIEW',1],['CAN_CREATE',2],['CAN_EDIT',4],['CAN_EDIT_ALL',8],['CAN_DELETE',16],['CAN_DELETE_ALL',32],['CAN_ADMIN',64],['SUPERADMIN',128]]
 end
 
+#############################################################################
+# Will return permissions for collection
+############################################################################
+def self.permissions_for_table(collection_name)
+  if collection_name.match(';')
+    collection, embedded, rest = collection_name.split(';')
+  else
+    collection, embedded = collection_name, nil
+  end
+  result = permissions_for('*')
+  result = permissions_for("#{collection[0,3]}*", result)
+  result = permissions_for(collection, result)
+  # include permissions for embedded documents
+  result = permissions_for("#{collection};#{embedded}", result) if embedded
+  result
+end
+
+#############################################################################
+# 
+############################################################################
+def self.permissions_for(collection_name, result = {}) #:nodoc:
+  permissions = if collection_name == '*'
+    self.find_by(is_default: true)
+  else
+    self.find_by(table_name: collection_name, active: true)
+  end
+  permissions.dc_policy_rules.each {|perm| result[perm.dc_policy_role_id] = perm.permission } if permissions
+  result
+end
+
 end

data/app/models/dc_poll.rb

@@ -63,6 +63,7 @@ field :operation,     type: String
 field :parameters,    type: String
 field :display,       type: String, default: '1'
 field :css,           type: String
+field :js,            type: String
 field :form,          type: String
 field :valid_from,    type: DateTime
 field :valid_to,      type: DateTime

data/app/models/dc_poll_result.rb

@@ -29,15 +29,17 @@
 #  _id                  BSON::ObjectId       _id
 #  dc_poll_id           BSON::ObjectId       poll id
 #  data                 String               Data saved as YAML
-# 
+#  confirmed            Boolean              Poll entry was confirmed
+#
 # Results of polls saved as YAML structure.
 ########################################################################
 class DcPollResult
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  field :data,         type: String
   belongs_to :dc_poll
+  field :data,        type: String
+  field :confirmed,   type: Boolean, default: false
 
   index( { dc_poll_id: 1 } )