drg_cms 0.6.1.0 → 0.6.1.6

data/app/helpers/cms_edit_helper.rb

@@ -91,32 +91,40 @@ end
 # normal link.
 ############################################################################
 def dc_actions_for_form(position)
-# create standard actions  
+  # create standard actions
   std_actions = {1 => 'back', 2 => {'type' => 'submit', 'caption' => 'drgcms.save'},
                  3 => {'type' => 'submit', 'caption' => 'drgcms.save&back'} }
-# when edit only  
+  # when edit only
   unless @record.try(:id).nil?
     std_actions.merge!({6 => 'new'} )
     std_actions.merge!(@record.active ? {5 => 'disable'} : {5 => 'enable'} ) if @record.respond_to?('active')
     std_actions.merge!({7 => 'refresh'} )
   end
+  # readonly
+  std_actions = { 1 => 'back' } if @form['readonly']
+
   actions = @form['form']['actions']
-# shortcut for actions: standard 
+  # shortcut for actions: standard
   actions = nil if actions.class == String && actions == 'standard'
-# standard actions
   actions = std_actions if actions.nil?
-# readonly 
-  actions = {1 => 'back'} if @form['readonly']
-  actions = {1 => 'close'} if params[:window_close]
-# Actions are strictly forbidden 
-  if @form['form']['actions'] and dc_dont?(@form['form']['actions'])
+
+  # Actions are strictly forbidden
+  if @form['form']['actions'] && dc_dont?(@form['form']['actions'])
     actions = []
   elsif actions['standard']
     actions.merge!(std_actions)
     actions['standard'] = nil
   end
-# Update save and save&back
-  actions.each do |k,v| 
+  # request for close window button present
+  if actions.class == Hash
+    case params[:window_close]
+    when '0' then actions[1] = 'close'; actions[3] = nil
+    when '1' then actions = { 1 => 'close' }
+    when '2' then actions = { 1 => 'close' }
+    end
+  end
+  # Update save and save&back
+  actions.each do |k, v|
     if v.class == String 
       if v.match(/save\&back/i)
         actions[k] = {'type' => 'submit', 'caption' => 'drgcms.save&back'}
@@ -125,23 +133,23 @@ def dc_actions_for_form(position)
       end
     end
   end
-# remove standard option and sort so that standard actions come first
+  # remove standard option and sort so that standard actions come first
   actions.delete('standard')
-  actions = actions.to_a.sort {|x,y| x[0] <=> y[0]} 
-# Add spinner to the beginning
+  actions = actions.to_a.sort { |x, y| x[0] <=> y[0] }
+  # Add spinner to the beginning
   html = %Q[<span class="dc-spinner">#{fa_icon('spinner lg spin')}</span><ul class="dc-menu #{position}">]
-  
+
   actions.each do |key, options|
     session[:form_processing] = "form:actions: #{key} #{options}"
-    next if options.nil?  # yes it happends
+    next if options.nil?  # yes it happens
     parms = @parms.clone
     if options.class == String
-      next if params[:readonly] and !options.match(/back|close/)
+      next if @form['readonly'] and !options.match(/back|close/)
       
       html << '<li class="dc-link dc-animate">'
       html << case 
         when (options == 'back' or options == 'cancle') then
-# If return_to is present link directly to URL        
+          # If return_to is present link directly to URL
           if parms['xreturn_to'] # disabled for now
             dc_link_to( 'drgcms.back','arrow-left', parms['return_to'] )
           else
@@ -186,6 +194,9 @@ def dc_actions_for_form(position)
       html << '</td>'
     # non standard actions      
     else
+      # action will be displayed when show: always or readonly option is declared and form is readonly
+      next if @form['readonly'] && !%w[readonly always].include?(options['show'].to_s)
+
       options['title'] = t("#{options['title'].downcase}", options['title']) if options['title']
       html << case 
       # submit button
@@ -296,13 +307,13 @@ def dc_fields_for_tab(fields_on_tab) #:nodoc:
       group_count  = options['group'] || 1 
       group_option = options['group'] || 1 
     end
-    #    
+
     html << if labels_pos == 'top'
-%Q[
+%(
 <div class="dc-form-label-top dc-color-#{odd_even} dc-align-left" title="#{help}">
   <label for="record_#{options['name']}">#{label} </label>
   <div id="td_record_#{options['name']}">#{field_html}</div>
-</div> ]
+</div> )
     else
       # no label
       if dc_dont?(options['caption'])
@@ -315,13 +326,14 @@ def dc_fields_for_tab(fields_on_tab) #:nodoc:
       else
         label_width = 14
         data_width  = 85      
-      end      
-%Q[
+      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>
 </div>
 <div id="td_record_#{options['name']}" class="dc-form-field dc-color-#{odd_even} dc-width-#{data_width}">#{field_html}</div>
-]
+)
     end
     # check if group end
     if (group_count -= 1) == 0
@@ -423,7 +435,7 @@ def dc_head_for_form
         @record.send(options['name'])
       end
     rescue Exception => e
-      dc_log_exception(e)
+      dc_log_exception(e, 'dc_head_for_form')
       field = '!!!Error'
     end
     #
@@ -447,11 +459,10 @@ end
 # Returns username for id. Subroutine of dc_document_statistics
 ###########################################################################
 def dc_document_user_for(field_name) #:nodoc:
-  if @record[field_name]
-    u = DcUser.find(@record[field_name])
-    return u ? u.name : @record[field_name]
-  end
-#  nil
+  return if @record[field_name].nil?
+
+  user = DcUser.find(@record[field_name])
+  user ? user.name : @record[field_name]
 end
 
 ############################################################################
@@ -502,5 +513,4 @@ def dc_top_bottom_line(location, options)
   end
 end
 
-
 end

data/app/helpers/cms_helper.rb

@@ -37,7 +37,7 @@ def dc_script_action(yaml)
 #  data = {'request' => 'script', 'script' => yaml['js'] || yaml['script'] }
 #  %Q[<li class="dc-link-ajax with-link dc-animate">#{ dc_link_to(yaml['caption'], yaml['icon'], '#', data: data ) }</li>]
   icon = dc_icon_for_link yaml['icon']
-  data = %Q[data-request="script" data-script="#{yaml['js'] || yaml['script']}"]
+  data = %(data-request="script" data-script="#{yaml['js'] || yaml['script']}" data-url="script")
   %Q[<li class="dc-link-ajax dc-animate" #{data}>#{icon} #{ t(yaml['caption'],yaml['caption']) }</li>]
 end
 
@@ -182,7 +182,7 @@ end
 # Returns:
 #   String : HTML code for action
 ############################################################################
-def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
+def dc_link_ajax_window_submit_action(yaml, record = nil, action_active = true)
   parms = {}
   caption = yaml['caption'] || yaml['text']
   caption = caption ? t("#{caption.downcase}", caption) : nil
@@ -241,7 +241,7 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
          data-request="#{request}" title="#{yaml['title']}">#{icon}#{caption}</li>]
 
     elsif yaml['type'] == 'link'  # link button
-      clas = "dc-link dc-animate"
+      clas = "dc-link plus-link dc-animate"
       link = dc_link_to(caption, yaml['icon'], parms, yaml['html'] )
       %Q[<li class="#{clas}">#{action_active ? link : caption}</li>]
 
@@ -256,10 +256,10 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
 end
 
 ############################################################################
-#
+# Log exception to rails log. Usefull for debugging eval errors.
 ############################################################################
-def dc_log_exception(exception)
-  log = exception ? "\n!!!Error: #{exception.message}\n#{exception.backtrace.first.inspect}\n" : ''
+def dc_log_exception(exception, where = '')
+  log = exception ? "\n*** Error:#{where + ':'} #{exception.message}\n#{exception.backtrace.first.inspect}\n" : ''
   log << "DRG Form processing line: #{session[:form_processing]}\n"
   
   logger.error log

data/app/helpers/cms_index_helper.rb

@@ -32,14 +32,17 @@ module CmsIndexHelper
 ############################################################################
 # Creates action div for cmsedit index action. 
 ############################################################################
-def dc_actions_for_index()
+def dc_actions_for_index
   @js  = @form['script'] || @form['js'] || ''
   @css = @form['css'] || ''
-  return '' if @form['index'].nil? or @form['readonly']
+  return '' if @form['index'].nil?
+
   actions = @form['index']['actions']
   return '' if actions.blank?
   
   std_actions = {2 => 'new', 3 => 'sort', 4 => 'filter' }
+  std_actions.delete(2) if @form['readonly']
+
   if actions.class == String
     actions = dc_define_standard_actions(actions, std_actions)
   elsif actions['standard']
@@ -60,6 +63,7 @@ def dc_actions_for_index()
   only_actions.each do |key, options|
     session[:form_processing] = "index:actions: #{key}=#{options}"
     next if options.nil? # must be
+
     url = @parms.clone
     yaml = options.class == String ? {'type' => options} : options # if single definition simulate type parameter
     action = yaml['type'].to_s.downcase 
@@ -80,7 +84,6 @@ def dc_actions_for_index()
     # html link options
     yhtml = yaml['html'] || {}
     yhtml['title'] = yaml['title'] if yaml['title']
-
     code = case
     # sort
     when action == 'sort' then 
@@ -109,14 +112,23 @@ def dc_actions_for_index()
       caption
 
     # new
-    when action == 'new' then 
+    when action == 'new' then
       caption = yaml['caption'] || 'drgcms.new'
-      dc_link_to(caption,'plus', url, yhtml )
+      html << "<li class=\"dc-link plus-link dc-animate\">#{dc_link_to(caption, 'plus', url, yhtml )}</li>"
+      next
+
+    when action == 'close' then
+      html << %(<li class="dc-link dc-animate" onclick="window.close();"'>#{fa_icon('close')} #{t('drgcms.close')}</li>)
+      next
 
     # menu
-    when action == 'menu' then  
-      caption = t(options['caption'], options['caption']) + '&nbsp;' + fa_icon('caret-down lg')
-      caption + eval(options['eval'])      
+    when action == 'menu' then
+      if options['caption']
+        caption = t(options['caption'], options['caption']) + '&nbsp;' + fa_icon('caret-down lg')
+        caption + eval(options['eval'])
+      else # when caption is false, provide own actions
+        eval(options['eval'])
+      end
 =begin
 # reorder      
     when action == 'reorder' then  
@@ -262,7 +274,7 @@ end
 ############################################################################
 def dc_actions_for_result(document)
   actions = @form['result_set']['actions']
-  return '' if actions.nil? or @form['readonly']
+  return '' if actions.nil? || @form['readonly']
 
   actions, width = dc_actions_column()
   html = %Q[<ul class="actions" style="width: #{width}px;">]
@@ -278,21 +290,27 @@ def dc_actions_for_result(document)
     else
       html << '<li class="dc-link">'
       html << case
+      when yaml['type'] == 'check' then
+        check_box_tag("check-#{document.id}", false,false,{ class: 'dc-check' })
+
       when yaml['type'] == 'edit' then
         parms['action'] = 'edit'
         parms['id']     = document.id
         dc_link_to( nil, 'pencil lg', parms )
+
       when yaml['type'] == 'duplicate' then
         parms['id']     = document.id
         # duplicate string will be added to these fields.
         parms['dup_fields'] = yaml['dup_fields'] 
         parms['action'] = 'create'
         dc_link_to( nil, 'copy lg', parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post )
+
       when yaml['type'] == 'delete' then
         parms['action'] = 'destroy'
         parms['id']     = document.id
-        parms['return_to'] = request.url
+        #parms['return_to'] = request.url
         dc_link_to( nil, 'remove lg', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete )
+
       # undocumented so far
       when yaml['type'] == 'edit_embedded'
         parms['controller'] = 'cmsedit'
@@ -314,11 +332,14 @@ end
 ############################################################################
 # Creates header div for result set.
 ############################################################################
-def dc_header_for_result()
+def dc_header_for_result
   html = '<div class="dc-result-header">'
   if @form['result_set']['actions'] and !@form['readonly']
     ignore, width = dc_actions_column()
-    html << %Q[<div class="actions" style="width:#{width}px;"></div>]
+    if width > 0 && @form['result_set']['actions'][0].to_s == 'check'
+      check_all = fa_icon('check-square-o', class: 'dc-check-all')
+    end
+    html << %Q[<div class="actions" style="width:#{width}px;">#{check_all}</div>]
   end
   # preparation for sort icon  
   sort_field, sort_direction = nil, nil
@@ -336,7 +357,8 @@ def dc_header_for_result()
       label = (v['name'] ? "helpers.label.#{@form['table']}.#{v['name']}" : '') if label.nil?
       label = t(label) if label.match(/\./)
       # no sorting when embedded documents or custom filter is active 
-      sort_ok = @form['result_set'].nil? || (@form['result_set'] && @form['result_set']['filter'].nil?)
+      #sort_ok = @form['result_set'].nil? || (@form['result_set'] && @form['result_set']['filter'].nil?)
+      sort_ok = !dc_dont?(@form['result_set']['sort'], false)
       sort_ok = sort_ok || (@form['index'] && @form['index']['sort'])
       sort_ok = sort_ok && !dc_dont?(v['sort'], false)
       if @tables.size == 1 and sort_ok
@@ -387,11 +409,13 @@ def dc_format_value(value, format=nil)
   return '' if value.nil?
 
   klass = value.class.to_s
-  if klass.match(/time|date/i)
-    CmsCommonHelper.dc_format_date_time(value, format)
-  elsif format.to_s[0] == 'N'
-    return '' if value == 0 and format.match('z')
+  return CmsCommonHelper.dc_format_date_time(value, format) if klass.match(/time|date/i)
 
+  format = format.to_s.upcase
+  if format[0] == 'N'
+    return '' if value == 0 && format.match('Z')
+
+    format.gsub!('Z', '')
     dec = format[1].blank? ? nil : format[1].to_i
     sep = format[2].blank? ? nil : format[2]
     del = format[3].blank? ? nil : format[3]
@@ -416,6 +440,7 @@ end
 ############################################################################
 def dc_columns_for_result(document)
   return '' unless @form['result_set']['columns']
+
   html = ''  
   @form['result_set']['columns'].sort.each do |k,v|
     session[:form_processing] = "result_set:columns: #{k}=#{v}"
@@ -438,7 +463,7 @@ def dc_columns_for_result(document)
         "??? #{v['name']}"
       end
     rescue Exception => e
-      dc_log_exception(e)
+      dc_log_exception(e, 'dc_columns_for_result')
       value = '!!!Error'
     end
     html << '<div class="spacer"></div>'
@@ -455,6 +480,14 @@ def dc_columns_for_result(document)
   html.html_safe
 end
 
+############################################################################
+# Split eval expression to array by parameters.
+# 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 }
+end
+
 private
 
 ############################################################################
@@ -474,14 +507,6 @@ def dc_process_eval(evaluate, parameters)
   end  
 end
 
-############################################################################
-# Split eval expression to array by parameters.
-# 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 }
-end
-
 ############################################################################
 # Process eval option for field value. 
 # Used for processing single field column on result_set or form head.
@@ -540,15 +565,19 @@ def dc_style_or_class(selector, yaml, value, record)
   # alias record and value so both names can be used in eval
   field, document = value, record
   html = selector ? "#{selector}=\"" : ''
-  html << if yaml.class == String
-    yaml
-  # direct evaluate expression
-  elsif yaml['eval']
-    eval(yaml['eval']) rescue 'background-color:red;'
-  elsif yaml['method']
-    dc_process_eval(yaml['method'], record)
+  begin
+    html << if yaml.class == String
+              yaml
+              # direct evaluate expression
+            elsif yaml['eval']
+              eval(yaml['eval'])
+            elsif yaml['method']
+              dc_process_eval(yaml['method'], record)
+            end
+  rescue Exception => e
+    dc_log_exception(e, 'dc_style_or_class')
   end
-  html << '"' if selector 
+  html << '"' if selector
   html
 end 
 
@@ -573,4 +602,20 @@ def dc_define_standard_actions(actions_params, standard)
   actions
 end
 
+############################################################################
+# When result set is to be drawn by Rails helper method.
+############################################################################
+def dc_process_result_set_method
+  if @form['result_set']['view']
+    render partial: @form['result_set']['view']
+  else
+    method = @form['result_set']['eval'] || 'result_set_eval_misssing'
+    if respond_to?(method)
+      send method
+    else
+      I18n.t('drgcms.no_method', method: method)
+    end
+  end
+end
+
 end