drg_cms 0.7.0.2 → 0.7.1.1

data/app/helpers/cms_common_helper.rb

@@ -44,20 +44,20 @@ module CmsCommonHelper
 # Returns: 
 # String. Translated text. 
 ####################################################################
-def self.t(key, default=nil)
+def self.t(key, default = nil)
   c = I18n.t(key)
-  if c.class == Hash or c.match( 'translation missing' )
+  if c.class == Hash || c.match( /translation missing/i )
     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
+    # Still not found, return default
+    if c.class == Hash || c.match( /translation missing/i )
+      c = default || key
     end
   end
   c
 end
 
 ####################################################################
-def t(key, default=nil) #:nodoc
+def t(key, default = nil) #:nodoc
   CmsCommonHelper.t(key, default)
 end
 
@@ -72,7 +72,7 @@ end
 # Returns: 
 # String. Translated text. 
 ####################################################################
-def t_tablename(tablename, default=nil)
+def t_tablename(tablename, default = nil)
   t('helpers.label.' + tablename + '.tabletitle', default || tablename)
 end
 
@@ -81,21 +81,31 @@ end
 # 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_label_for_field(field_name, default='')
-  c = t("helpers.label.#{@form['table']}.#{field_name}", default)
-  c = field_name.capitalize.gsub('_',' ') if c.match( 'translation missing' )
-  c
+def t_label_for_field(field_name, default = '')
+  c = (@form['i18n_prefix'] || "helpers.label.#{@form['table']}") + ".#{field_name}"
+  c = field_name if field_name.match(/helpers\./)
+
+  label = t(c, default)
+  label = field_name.capitalize.gsub('_', ' ') if c.match( /translation missing/i )
+  label
 end
 
 ############################################################################
-# Returns label for field translated to current locale for usage browser header.
+# Returns label for field translated to current locale for usage in browser header.
 # Translation is provided by lang.helpers.label.table_name.field_name locale. If
 # not found method will look in standard drgcms translations.
-#
 ############################################################################
 def t_label_for_column(options)
   label = options['caption'] || options['label']
-  label = (options['name'] ? "helpers.label.#{@form['table']}.#{options['name']}" : '') if label.nil?
+  return ' ' if label == false
+
+  if label.blank?
+    label = if options['name']
+              prefix = @form['i18n_prefix'] || "helpers.label.#{@form['table']}"
+              "#{prefix}.#{options['name']}"
+            end
+    label = label.to_s
+  end
   label = t(label) if label.match(/\./)
   label = t("drgcms.#{options['name']}") if label.match('helpers.') # standard field names like created_by, updated_at
   label
@@ -127,9 +137,10 @@ end
 ############################################################################
 def self.dc_name_for_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 }
+
+  choices = t("helpers.label.#{model}.choices4_#{field}")
+  values  = choices.chomp.split(',').map{ _1.split(':') }
+  values.each{ |e| return e.first if e.last.to_s == value.to_s }
   '???'
 end
 
@@ -160,9 +171,10 @@ end
 # Array. Choices for select input field
 ############################################################################
 def self.dc_choices_for_field(model, field)
-  c = CmsCommonHelper.t('helpers.label.' + model + '.choices4_' + field )
-  return ['error'] if c.match( 'translation missing' )
-  c.chomp.split(',').inject([]) {|r,v| r << v.split(':') }
+  choices = CmsCommonHelper.t("helpers.label.#{model}.choices4_#{field}" )
+  return ['error'] if choices.match( /translation missing/i )
+
+  choices.chomp.split(',').map{ _1.split(':') }
 end
 
 ############################################################################
@@ -206,13 +218,13 @@ end
 # Returns: 
 # String. Name (descriptive value) for specified key in table.
 ############################################################################
-def dc_name_for_id(model, field, field_name, id=nil)
+def dc_name_for_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
-  doc = Mongoid::QueryCache.cache { model.find_by(field_name => id) }
+  doc = Mongo::QueryCache.cache { model.find_by(field_name => id) }
 
   doc.nil? ? '' : (doc.send(field) rescue 'not defined')
 end
@@ -220,7 +232,7 @@ end
 ############################################################################
 #
 ############################################################################
-def dc_name4_id(model, field, field_name, id=nil) #nodoc
+def dc_name4_id(model, field, field_name, id = nil) #nodoc
   #dc_deprecate('dc_name4_id will be deprecated. Use dc_name_for_id instead.')
   dc_name_for_id(model, field, field_name, id) 
 end
@@ -250,7 +262,7 @@ end
 ############################################################################
 #
 ############################################################################
-def dc_icon4_boolean(document = false, field_name = false) #nodoc
+def dc_icon4_boolean(document = false, field_name = nil) #nodoc
   #dc_deprecate('dc_icon4_boolean will be deprecated. Use dc_icon_for_boolean instead.')
   dc_icon_for_boolean(document, field_name)
 end

data/app/helpers/cms_edit_helper.rb

@@ -44,17 +44,11 @@ def dc_value_for_parameter(param, current_document = nil)#:nodoc:
 end
 
 ############################################################################
-# Creates actions div for edit form.
-# 
-# Displaying readonly form turned out to be challenge. For now when readonly parameter
-# has value 2, back link will force readonly form. Value 1 or not set will result in
-# normal link.
+# Determine if action button on the form is active. Action will be greyed out otherwise.
+#
+# @return : Boolean : defined by 'active' option'. Default is True.
 ############################################################################
 def dc_is_action_active?(options)
-  if options['when_new']
-    dc_deprecate("when_option will be deprecated and replaced by active: not_new_record! Form #{CmsHelper.form_param(params)}")
-    return !(dc_dont?(options['when_new']) && @record.new_record?)
-  end
   return true unless options['active']
 
   # alias record and document so both can be used in eval
@@ -322,25 +316,25 @@ def dc_head_for_form
     caption = options['caption']
     span    = options['span'] || 1
     @css << "\n#{options['css']}" unless options['css'].blank?
-    label   = if caption.blank?
-      ''
-    elsif options['name'] == caption
-      t_label_for_field(options['name'], options['name'].capitalize.gsub('_',' ') )
-    else
-      t(caption, caption) 
-    end
+    label = if caption.blank?
+              ''
+            elsif options['name'] == caption
+              t_label_for_field(options['name'], options['name'].capitalize.gsub('_', ' ') )
+            else
+              t(caption, caption)
+            end
     # Field value
     begin
       field = if options['eval']
-        dc_process_column_eval(options, @record)
-      else
-        @record.send(options['name'])
-      end
+                dc_process_column_eval(options, @record)
+              else
+                dc_format_value(@record.send(options['name']), options['format'])
+              end
     rescue Exception => e
       dc_log_exception(e, 'dc_head_for_form')
       field = '!!!Error'
     end
-    #
+
     klass = dc_style_or_class(nil, options['class'], field, @record)
     style = dc_style_or_class(nil, options['style'], field, @record)
     html << %(<div class="dc-column #{klass}" style="width:#{percent*span}%;#{style}">
@@ -487,18 +481,17 @@ def dc_input_form_create(fields_on_tab) #:nodoc:
 </div> )
             else
               # no label
-              if dc_dont?(options['caption'])
-                label = ''
-                label_width = 0
-                data_width  = 100
-              elsif group_option > 1
-                label_width = group_option != group_count ? 10 : 14
-                data_width  = 21
-              else
-                label_width = 14
-                data_width  = 85
-              end
-              help.gsub!('<br>',"\n") if help.present?
+              label_width, data_width = if dc_dont?(options['caption'])
+                                          label = ''
+                                          [0, 100]
+                                        elsif group_option == 1
+                                          [14, 85]
+                                        elsif group_option == 2
+                                          group_count == 2 ? [14, 21] : [10, 45]
+                                        elsif group_option == 3
+                                          group_count == 3 ? [14, 21] : [10, 21]
+                                        end
+              help.gsub!('<br>', "\n") if help.present?
               %(
 <div class="dc-form-label dc-color-#{odd_even} dc-align-#{labels_pos} dc-width-#{label_width}" title="#{help}">
   <label for="record_#{options['name']}">#{label} </label>

data/app/helpers/cms_helper.rb

@@ -53,12 +53,12 @@ end
 ############################################################################
 def dc_get_field_form_definition(name) #:nodoc:
   return if @form['form'].nil?
-  
+
   @form['form']['tabs'].each do |tab|
     # Array with 2 elements. First is tab name, second is data
     my_fields = tab.last
     my_fields.each { |k, v| return v if (k.class == Integer && v['name'] == name) }
-  end if @form['form']['tabs'] #  I know. But nice. 
+  end if @form['form']['tabs'] #  I know. But nice.
 
   @form['form']['fields'].each do |field|
     next unless field.first.class == Integer # options
@@ -102,17 +102,18 @@ end
 # Return label and help text for a field defined on Form.
 #
 # Parameters:
-# options : Hash : Field definition
+#   @options : Hash : Field definition
 #
 # Returns:
-#   label : String : Label text
-#   help : String : Help text
+#   @label : String : Label text
+#   @help : String : Help text
 ############################################################################
 def dc_label_help(options)
   # no label or help in comments
-  return [nil, nil] if %w(comment action).include?(options['type'])
+  return [nil, nil] if %w[comment action].include?(options['type'])
 
   label = options['caption'] || options['text'] || options['label']
+  label = '' if options['type'] == 'check_box'
   if options['name']
     label = if label.blank?
               t_label_for_field(options['name'], options['name'].capitalize.gsub('_',' ') )
@@ -122,8 +123,16 @@ def dc_label_help(options)
   end
   # help text can be defined in form or in translations starting with helpers. or as helpers.help.collection.field
   help = options['help']
-  help ||= "helpers.help.#{@form['table']}.#{options['name']}" if options['name']
-  help = t(help, ' ') if help.to_s.match(/helpers\./)
+  if help.blank?
+    help = if options['name']
+             # if defined as i18n_prefix replace "label" with "help"
+             prefix = @form['i18n_prefix'] ? @form['i18n_prefix'].sub('label', 'help') : "helpers.help.#{@form['table']}"
+             "#{prefix}.#{options['name']}"
+           end
+    help = help.to_s
+  end
+  help = t(help, ' ') if help.to_s.match(/help\./)
+
   [label, help]
 end
 
@@ -167,7 +176,7 @@ def dc_field_action(yaml)
     field, label, help = dc_field_label_help(yaml)
   end
   # input field will have label as placeholder
-  field = field.sub('input',"input placeholder=\"#{label}\"")
+  field = field.sub('input', "input placeholder=\"#{label}\"")
   %(<li class="no-background">#{field}</li>)
 end
 
@@ -177,7 +186,7 @@ end
 def dc_html_data(yaml)
   return '' if yaml.blank?
 
-  yaml.inject(' ') { |result, e| result = e.last.nil? ? result : result << "#{e.first}=\"#{e.last}\" " }
+  yaml.inject(' ') { |result, e| result << (e.last ? %(#{e.first}="#{e.last}" ) : '') }
 end
 
 ############################################################################
@@ -300,10 +309,18 @@ def dc_log_exception(exception, where = '')
 end
 
 ############################################################################
-# Will return form id, to be used on each form for simpler css selecting.
+# Will return form id. id can be used for css selecting of fields on form.
+# Form id is by default form_name || table parameter.
 ############################################################################
 def dc_form_id
-  %( id=#{CmsHelper.form_param(params) || CmsHelper.table_param(params)} )
+  %(id="#{CmsHelper.form_param(params) || CmsHelper.table_param(params)}" ).html_safe
+end
+
+############################################################################
+# Will return class for form. Class can be used for different styling of forms.
+############################################################################
+def dc_form_class(additional_class = nil)
+  %(class="#{additional_class} #{@form['class']}" ).html_safe
 end
 
 ############################################################################