drg_cms 0.6.1.11 → 0.7.0.8

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,29 @@ 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?
+  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
@@ -161,8 +169,8 @@ end
 ############################################################################
 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(':') }
+  return ['error'] if c.match( /translation missing/i )
+  c.chomp.split(',').inject([]) { |r, v| r << v.split(':') }
 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
@@ -137,7 +131,7 @@ def dc_actions_for_form(position)
   actions.delete('standard')
   actions = actions.to_a.sort { |x, y| x[0] <=> y[0] }
   # Add spinner to the beginning
-  html = %Q[<span class="dc-spinner">#{fa_icon('settings-o spin')}</span><ul class="dc-menu #{position}">]
+  html = %(<span class="dc-spinner">#{mi_icon('settings-o spin')}</span><ul class="dc-menu #{position}">)
 
   actions.each do |key, options|
     session[:form_processing] = "form:actions: #{key} #{options}"
@@ -211,7 +205,7 @@ def dc_actions_for_form(position)
              dc_submit_tag(caption, icon, { data: parameters, title: options['title'] }) +
           '</li>'
         else
-          %(<li><div class="dc-link-no">#{fa_icon(icon)} #{caption}</div></li>)
+          %(<li><div class="dc-link-no">#{mi_icon(icon)} #{caption}</div></li>)
         end
       
       # delete with some sugar added
@@ -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

@@ -110,7 +110,7 @@ end
 ############################################################################
 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']
   if options['name']
@@ -122,8 +122,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
 
@@ -300,10 +308,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
 
 ############################################################################

data/app/helpers/cms_index_helper.rb

@@ -35,12 +35,10 @@ module CmsIndexHelper
 def dc_actions_for_index
   @js  = @form['script'] || @form['js'] || ''
   @css = @form['css'] || ''
-  return '' if @form['index'].nil?
-
-  actions = @form['index']['actions']
+  actions = @form.dig('index', 'actions')
   return '' if actions.blank?
   
-  std_actions = {2 => 'new', 3 => 'sort', 4 => 'filter' }
+  std_actions = { 2 => 'new', 3 => 'sort', 4 => 'filter' }
   std_actions.delete(2) if @form['readonly']
 
   if actions.class == String
@@ -51,22 +49,16 @@ def dc_actions_for_index
   end
   
   html_left, html_right = '', ''
-  # Remove actions settings and sort
-  only_actions = []
-  actions.each { |key, value| only_actions << [key, value] if key.class == Integer }
-  only_actions.sort_by!(&:first)
-  only_actions.each do |key, options|
+  # remove settings and sort
+  actions_only = actions.inject([]) { |r, action| r << action if action.first.class == Integer; r }.sort_by(&:first)
+  actions_only.each do |key, options|
     session[:form_processing] = "index:actions: #{key}=#{options}"
     next if options.nil? # must be
 
-    url = @form_params.clone
-    yaml = options.class == String ? {'type' => options} : options # if single definition simulate type parameter
+    url    = @form_params.clone
+    yaml   = options.class == String ? { 'type' => options } : options # sinle action. Simulate type parameter
     action = yaml['type'].to_s.downcase 
-    if action == 'url'
-      dc_deprecate "action: url will be deprecated. Use action: link in index: actions! Form #{params['form_name']}"
-      action = 'link' 
-    end
-    # if return_to is present link directly to URL
+
     if action == 'link' && yaml['url']
       url = yaml['url']
     else
@@ -89,10 +81,8 @@ def dc_actions_for_index
           choices << [ t("helpers.label.#{@form['table']}.#{e}"), e ]
         end
       end
-      data = t('drgcms.sort') + select('sort', 'sort', choices, { include_blank: true }, { class: 'dc-sort-select',
-                                                                                           'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
-      data = mi_icon('sort') + select('sort', 'sort', choices, { include_blank: true }, { class: 'dc-sort-select',
-                                                                                           'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
+      data = mi_icon('sort') + select('sort', 'sort', choices, { include_blank: true },
+                                      { class: 'dc-sort-select', 'data-table': @form['table'], 'data-form': CmsHelper.form_param(params)} )
       html_right << %(<li title="#{t('drgcms.sort')}"><div class="dc-sort">#{data}</li>)
 
     # filter
@@ -263,9 +253,16 @@ def dc_actions_column
     actions.delete('standard')
   end
   # check must be first action
-  has_check = actions[0] && actions[0]['type'] == 'check'
-  width = actions.size == 1 ? 22 : 44
-  width = 22 if actions.size > 2 && !has_check
+  has_check = has_action_type('check', actions)
+  # when readonly only check and show are allowed
+  if @form['readonly']
+    width  = has_action_type('show', actions) ? 22 : 0
+    width += 22 if has_check
+  else
+    width = actions.size == 1 ? 22 : 44
+    width = 22 if actions.size > 2 && !has_check
+  end
+
   [actions, width, has_check]
 end
 
@@ -275,7 +272,7 @@ end
 def dc_actions_column_for_footer
   return '' unless @form['result_set']['actions']
 
-  ignore, width, ignore2 = dc_actions_column
+  ignore, width, ignore2 = dc_actions_column()
   %(<div class="dc-result-actions" style="width: #{width}px;"></div>).html_safe
 end
 
@@ -284,10 +281,10 @@ end
 ############################################################################
 def dc_actions_for_result(document)
   actions = @form['result_set']['actions']
-  return '' if actions.nil? || @form['readonly']
+  return '' if actions.nil? #|| @form['readonly']
 
   actions, width, has_check = dc_actions_column()
-  has_sub_menu = actions.size > 2 || (has_check && actions.size > 1)
+  has_sub_menu = actions.size > 2 #|| (has_check && actions.size > 1)
 
   main_menu, sub_menu = '', ''
   actions.sort_by(&:first).each do |num, action|
@@ -296,14 +293,16 @@ def dc_actions_for_result(document)
     # if single definition simulate type parameter
     yaml = action.class == String ? { 'type' => action } : action
 
+    next if @form['readonly'] && !%[show check].include?(yaml['type'])
+
     if %w(ajax link window popup submit).include?(yaml['type'])
       @record = document # otherwise document fields can't be used as parameters
       html = dc_link_ajax_window_submit_action(yaml, document)
     else
       caption = dc_get_caption(yaml) || "drgcms.#{yaml['type']}"
-      title   = t(yaml['help'] || caption, '')
+      title   = t(yaml['title'] || yaml['help'] || caption)
       caption = has_sub_menu ? t(caption, '') : nil
-      html = '<li>'
+      html    = '<li>'
       html << case yaml['type']
       when 'check' then
         main_menu << '<li>' + check_box_tag("check-#{document.id}", false, false, { class: 'dc-check' }) + '</li>'
@@ -312,13 +311,15 @@ def dc_actions_for_result(document)
       when 'edit' then
         parms['action'] = 'edit'
         parms['id'] = document.id
+        parms['readonly'] = yaml['readonly']
         dc_link_to( caption, 'edit-o', parms, title: title )
 
       when 'show' then
         parms['action'] = 'show'
         parms['id'] = document.id
         parms['readonly'] = true
-        dc_link_to( caption, 'eye', parms, title: title )
+        icon = yaml['icon'] || 'eye-o'
+        dc_link_to( caption, icon, parms, title: title )
 
       when 'duplicate' then
         parms['id'] = document.id
@@ -362,7 +363,7 @@ end
 ############################################################################
 def dc_header_for_result
   html = '<div class="dc-result-header">'
-  if @form['result_set']['actions'] && !@form['readonly']
+  if @form['result_set']['actions'] #&& !@form['readonly']
     ignore, width, has_check = dc_actions_column()
     check_all = fa_icon('check-box-o', class: 'dc-check-all') if has_check
     html << %(<div class="dc-result-actions" style="width:#{width}px;">#{check_all}</div>)
@@ -436,7 +437,7 @@ end
 ############################################################################
 # Formats value according to format supplied or data type. There is lots of things missing here.
 ############################################################################
-def dc_format_value(value, format=nil)
+def dc_format_value(value, format = nil)
   return '' if value.nil?
 
   klass = value.class.to_s
@@ -444,7 +445,7 @@ def dc_format_value(value, format=nil)
 
   format = format.to_s.upcase
   if format[0] == 'N'
-    return '' if value == 0 && format.match('Z')
+    return '' if format.match('Z') && value.to_s.to_f == 0.0
 
     format.gsub!('Z', '')
     dec = format[1].blank? ? nil : format[1].to_i
@@ -491,7 +492,9 @@ def dc_columns_for_result(document)
                 dc_process_column_eval(v, document)
               # as field
               elsif document.respond_to?(v['name'])
-                dc_format_value(document.send( v['name'] ), v['format'])
+                dc_format_value(document.send(v['name']), v['format'])
+              elsif respond_to?(v['name'])
+                dc_format_value(send(v['name'], document), v['format'])
               else
                 "??? #{v['name']}"
               end
@@ -501,7 +504,7 @@ def dc_columns_for_result(document)
     end
     html << '<div class="spacer"></div>'
     # set class
-    clas = dc_style_or_class(nil, v['td_class'], value, document)
+    clas = dc_style_or_class(nil, v['td_class'] || v['class'], value, document)
     # set width and align an additional style
     style = dc_style_or_class(nil, v['td_style'] || v['style'], value, document)
     flex_align  = v['align'].to_s == 'right' ? 'flex-direction:row-reverse;' : ''
@@ -522,15 +525,13 @@ def dc_eval_to_array(expression)
   expression.split(/\ |\,|\(|\)/).delete_if {|e| e.blank? }.map {|e| e.gsub(/\'|\"/,'').strip }
 end
 
-private
-
 ############################################################################
 # Process eval. Breaks eval option and calls with send method.
 # Parameters:
 #   evaluate : String : Expression to be evaluated
 #   parameters : Array : array of parameters which will be send to method
 ############################################################################
-def dc_process_eval(evaluate, parameters)
+def dc_process_eval(evaluate, parameters = nil)
   # evaluate by calling send method 
   clas, method = evaluate.split('.')
   if method.nil?
@@ -541,6 +542,8 @@ def dc_process_eval(evaluate, parameters)
   end  
 end
 
+private
+
 ############################################################################
 # Process eval option for field value. 
 # Used for processing single field column on result_set or form head.
@@ -594,7 +597,7 @@ end
 # Defines style or class for row (tr) or column (td)
 ############################################################################
 def dc_style_or_class(selector, yaml, value, record)
-  return '' if yaml.nil?
+  return '' if yaml.blank?
 
   # alias record and value so both names can be used in eval
   field, document = value, record
@@ -662,4 +665,16 @@ def form_has_input_field?(field_name)
   !(field['type'] == 'readonly' || field['readonly'])
 end
 
+############################################################################
+# return true if actions define check or show option
+############################################################################
+def has_action_type(type, actions)
+  h = { 'check' => 0, 'show' => 1 }
+  return false unless identifier = h[type]
+  return false unless actions[identifier]
+
+  type_value = actions[identifier].class == String ? actions[identifier] : actions[identifier]['type']
+  type_value == type
+end
+
 end