drg_cms 0.7.0.2 → 0.7.1.1

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
@@ -139,12 +129,17 @@ def dc_actions_for_index
       parms['id']       = params[:ids]
       parms['table']     = @form['table']
       dc_link_to( caption, 'reorder', parms, method: :delete )              
-=end     
+=end
+
     when action == 'script'
       html_left << dc_script_action(options)
 
     when action == 'field'
-      html_right << dc_field_action(yaml)
+      if options['position'] && options['position'] == 'left'
+        html_left << dc_field_action(yaml)
+      else
+        html_right << dc_field_action(yaml)
+      end
 
     when %w(ajax link window popup submit).include?(action)
       html_left << dc_link_ajax_window_submit_action(options, nil)
@@ -263,9 +258,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 +277,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 +286,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,41 +298,48 @@ 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
+      when 'check'
         main_menu << '<li>' + check_box_tag("check-#{document.id}", false, false, { class: 'dc-check' }) + '</li>'
         next
 
-      when 'edit' then
+      when 'edit'
         parms['action'] = 'edit'
         parms['id'] = document.id
-        dc_link_to( caption, 'edit-o', parms, title: title )
+        parms['readonly'] = yaml['readonly']
+        icon = yaml['icon'] || 'edit-o'
+        dc_link_to( caption, icon, parms, title: title )
 
-      when 'show' then
+      when 'show'
         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
+      when 'duplicate'
         parms['id'] = document.id
         # duplicate string will be added to these fields.
         parms['dup_fields'] = yaml['dup_fields'] 
         parms['action'] = 'create'
-        dc_link_to( caption, 'content_copy-o', parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post, title: title )
+        icon = yaml['icon'] || 'content_copy-o'
+        dc_link_to( caption, icon, parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post, title: title )
 
-      when 'delete' then
+      when 'delete'
         parms['action'] = 'destroy'
         parms['id'] = document.id
-        dc_link_to( caption, 'delete-o', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete, title: title )
+        icon = yaml['icon'] || 'delete-o'
+        dc_link_to( caption, icon, parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete, title: title )
 
       else # error. 
         yaml['type'].to_s
@@ -362,7 +371,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 +445,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 +453,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
@@ -479,7 +488,7 @@ def dc_columns_for_result(document)
 
     # convert shortcut to hash 
     v = {'name' => v} if v.class == String    
-    begin
+    #begin
               # as Array (footer)
       value = if document.class == Array
                 dc_format_value(document[index], v['format']) if document[index]
@@ -491,17 +500,19 @@ 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
-    rescue Exception => e
-      dc_log_exception(e, 'dc_columns_for_result')
-      value = '!!!Error'
-    end
+    #rescue Exception => e
+    #  dc_log_exception(e, 'dc_columns_for_result')
+    #  value = '!!!Error'
+    #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;' : ''
@@ -519,19 +530,17 @@ end
 # Ex. Will split dc_name4_value(one ,"two") => ['dc_name4_value', 'one', 'two']
 ############################################################################
 def dc_eval_to_array(expression)
-  expression.split(/\ |\,|\(|\)/).delete_if {|e| e.blank? }.map {|e| e.gsub(/\'|\"/,'').strip }
+  expression.split(/\ |\,|\(|\)/).select(&:present?).map{ _1.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)
-  # evaluate by calling send method 
+def dc_process_eval(evaluate, parameters = nil)
+  # evaluate by calling send method
   clas, method = evaluate.split('.')
   if method.nil?
     send(clas, *parameters)
@@ -541,41 +550,49 @@ def dc_process_eval(evaluate, parameters)
   end  
 end
 
+private
+
 ############################################################################
-# Process eval option for field value. 
+# Process eval option for field value.
+#
 # Used for processing single field column on result_set or form head.
 ############################################################################
+#TODO make it universal without parameters complications
 def dc_process_column_eval(yaml, document)
-  # dc_name_for_id
-  if yaml['eval'].match(/dc_name4_id|dc_name_for_id/)
-    parms = dc_eval_to_array(yaml['eval'])
-    if parms.size == 3
-      dc_name_for_id(parms[1], parms[2], nil, document[ yaml['name'] ])
-    else
-      dc_name_for_id(parms[1], parms[2], parms[3], document[ yaml['name'] ])
+  if yaml['params'].blank?
+    parms  = dc_eval_to_array(yaml['eval'])
+    method = parms.shift
+
+    # prepare parameters for dc_name_for_* methods
+    method.sub!('dc_name4_', 'dc_name_for_') if method.match(/^dc_name4_/)
+    if method == 'dc_name_for_id' && parms.size == 2
+      parms << 'id'
     end
-
-  # dc_name_for_value from locale definition
-  elsif yaml['eval'].match(/dc_name4_value|dc_name_for_value/)
-    parms = dc_eval_to_array(yaml['eval'])
-    if parms.size == 1
-      dc_name_for_value( @form['table'], yaml['name'], document[ yaml['name'] ] )
-    else
-      dc_name_for_value( parms[1], parms[2], document[ yaml['name'] ] )
+    if method == 'dc_name_for_value' && parms.size < 2
+      parms = [@form['table'], yaml['name']]
     end
 
-  # defined in helpers. For example dc_icon_for_boolean
-  elsif respond_to?(yaml['eval'])
-    send(yaml['eval'], document, yaml['name'])
+    parms << document[yaml['name']]
+    parms.map!{ %w[record document].include?(_1.to_s) ? document : _1 }
+    case
+    when method.match(/^dc_/)
+      send(method, *parms)
 
-  # defined in model
-  elsif document.respond_to?(yaml['eval'])
-    document.send(yaml['eval'])
+    when respond_to?(method)
+      parms = [document] + parms
+      send(method, *parms)
 
-  # special eval  
-  elsif yaml['eval'].match('eval ')
-  # TO DO evaluate with specified parameters
+    # model method
+    when document.respond_to?(method)
+      document.send(method)
 
+    # some class method
+    when method.match('.')
+      klass, method = method.split('.')
+      klass.classify.constantize.send(method, *parms)
+    else
+      '?????'
+    end
   # eval with params
   else
     parms = {}
@@ -594,7 +611,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 +679,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