drg_cms 0.6.0.8 → 0.6.1.5

data/app/helpers/cms_edit_helper.rb

@@ -33,11 +33,13 @@ module CmsEditHelper
 # Will return value when internal or additional parameters are defined in action
 # Subroutine of dc_actions_for_form.
 ############################################################################
-def dc_value_for_parameter(param)#:nodoc:
+def dc_value_for_parameter(param, current_document = nil)#:nodoc:
   if param.class == Hash
-    dc_internal_var(param['object'] || 'record', param['method'])
+    dc_internal_var(param['object'] ||= 'record', param['method'], current_document)
+  elsif param.to_s.match(/record|document/)
+    current_document ? current_document : @record
   else
-    param    
+    param
   end
 end
 
@@ -51,9 +53,10 @@ end
 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 #{params[:form_name]}") 
-    return !(dc_dont?(options['when_new']) and @record.new_record?)
+    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
   record = document = @record
   option = options['active']
@@ -65,8 +68,7 @@ def dc_is_action_active?(options)
       (@record.new_record? && option == 'new_record') || (!@record.new_record? && option == 'not_new_record')
     elsif option.match(/\./)
       # shortcut for method and eval option
-      parms = @record ? @record : params
-      dc_process_eval(option,parms)
+      dc_process_eval(option, self)
     else
       eval(option['eval'])
     end
@@ -74,9 +76,8 @@ def dc_is_action_active?(options)
   when option['eval'] then
     eval(option['eval'])
   when option['method'] then
-    # if record present send record otherwise send params as parameter
-    parms = @record ? @record : params
-    dc_process_eval(option['method'],parms)
+    # if record present send record otherwise send self as parameter
+    dc_process_eval(option['method'], self)
   else
     false
   end  
@@ -90,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'}
@@ -124,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
@@ -185,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
@@ -233,7 +245,7 @@ def dc_background_for_result(start)
   if start == :start
     html = '<div class="dc-result-div" ' 
     html << (@form['result_set']['table_style'] ? 'style="overflow-x: scroll;" >' : '>')
-  #
+
     html << "\n<div class=\"dc-result #{@form['result_set']['table_class']}\" "
     html << (@form['result_set']['table_style'] ? "style=\"#{@form['result_set']['table_style']}\" >" : '>')
   else
@@ -295,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'])
@@ -314,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
@@ -335,9 +348,9 @@ def dc_fields_for_tab(fields_on_tab) #:nodoc:
 end
 
 ############################################################################
-# Creates edit form div. 
+# Creates edit form from fields or tabs options
 ############################################################################
-def dc_fields_for_form()
+def dc_fields_for_form
   html, tabs, tab_data = '',[], ''
   @js  ||= ''
   @css ||= ''
@@ -350,10 +363,10 @@ def dc_fields_for_form()
     first = true # first tab 
     @form['form']['tabs'].keys.sort.each do |tab_name|
       next if tab_name.match('actions')
-      # Tricky. If field name is not on the tab skip to next tab
+      # Tricky when editing single field. If field is not present on the tab skip to next tab
       if params[:edit_only]
         is_on_tab = false
-        @form['form']['tabs'][tab_name].each {|k,v| is_on_tab = true if params[:edit_only] == v['name'] }
+        @form['form']['tabs'][tab_name].each { |k, v| is_on_tab = true if params[:edit_only] == v['name'] }
         next unless is_on_tab
       end
       # first div is displayed, all others are hidden
@@ -361,17 +374,18 @@ def dc_fields_for_form()
       tab_data << ' class="div-hidden"' unless first
       tab_data << " style=\"height: #{@form['form']['height']}px;\"" if @form['form']['height']
       tab_data << ">#{dc_fields_for_tab(@form['form']['tabs'][tab_name])}</div>"
-      tab_label = @form['form']['tabs'][tab_name]['caption'] || tab_name 
-      tabs << [tab_name, tab_label]
+
+      tab_label, tab_title = dc_tab_label_help(tab_name)
+      tabs << [tab_name, tab_label, tab_title]
       first = false      
     end
     # make it all work together
     html << '<ul class="dc-form-ul" >'
     first = true # first tab must be selected
-    tabs.each do |tab_name, tab_label| 
-      html << "<li id=\"li_#{tab_name}\" data-div=\"#{tab_name.delete("\s\n")}\" class=\"dc-form-li"
-      html << ' dc-form-li-selected' if first 
-      html << "\">#{t(tab_label, t_name(tab_label, tab_label))}</li>"
+    tabs.each do |tab_name, tab_label, tab_title|
+      html << %(<li id="li_#{tab_name}" data-div="#{tab_name.delete("\s\n")}" title="#{tab_title}" class="dc-form-li)
+      html << ' dc-form-li-selected' if first
+      html << "\">#{tab_label}</li>"
       first = false
     end
     html << '</ul>'
@@ -391,11 +405,11 @@ end
 # Creates head form div. Head form div is used to display header data usefull
 # to be seen even when tabs are switched.
 ############################################################################
-def dc_head_for_form()
+def dc_head_for_form
   @css ||= ''
   head = @form['form']['head']
   return '' if head.nil?
-  html    = %Q[<div class="dc-head #{head['class']}">\n<div class="dc-row">]
+  html    = %(<div class="dc-head #{head['class']}">\n<div class="dc-row">)
   split   = head['split'] || 4
   percent = 100/split
   current = 0
@@ -421,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
     #
@@ -429,7 +443,7 @@ def dc_head_for_form()
     style = dc_style_or_class(nil, options['style'], field, @record)
     html << %Q[<div class="dc-column #{klass}" style="width:#{percent*span}%;#{style}">
   #{label.blank? ? '' : "<span class=\"label\">#{label}</span>"}
-  <span class="field">#{field}</span>
+  <span id="head-#{options['name']}" class="field">#{field}</span>
 </div>]
     current += span
     if current == split
@@ -445,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
 
 ############################################################################
@@ -471,8 +484,14 @@ def dc_document_statistics
   parms[:controller] = 'dc_common'
   parms[:action]     = 'copy_clipboard'
   url = url_for(parms.permit!)
-  html << fa_icon('copy 2x', class: 'dc-link-img dc-link-ajax dc-animate', 
+  html << fa_icon('copy lg', class: 'dc-link-img dc-link-ajax dc-animate',
                   'data-url' => url, 'data-request' => 'get', title: t('drgcms.doc_copy_clipboard') )
+
+  url = url_for(controller: :cmsedit, action: :index, table: 'dc_journal', filter: 'on',
+                filter_oper: 'eq', filter_field: 'doc_id', filter_value: @record.id)
+  html << fa_icon('history lg', class: 'dc-link-img dc-animate dc-window-open',
+                  'data-url' => url, title: t('helpers.label.dc_journal.tabletitle') )
+
   (html << '</div></div>').html_safe
 end
 
@@ -494,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
 
@@ -46,7 +46,7 @@ end
 # Field definition will be used for input field on the form.
 ############################################################################
 def dc_get_field_form_definition(name) #:nodoc:
-  return nil if @form['form'].nil?
+  return if @form['form'].nil?
   
   @form['form']['tabs'].each do |tab|
 # Array with 2 elements. First is tabname, second is data      
@@ -67,26 +67,14 @@ end
 # Parameters:
 # options : Hash : Field definition
 # 
-# Returns: 
+# Returns: Array[3]
 #   field_html : String : HTML code for field definition
 #   label : String : Label text
 #   help : String : Help text
 ############################################################################
 def dc_field_label_help(options)
-  # no label or help in comments
-  unless %w(comment action).include?(options['type'])
-    label = options['caption'] || options['text'] || options['label']
-    label = if label.blank?
-      t_name(options['name'], options['name'].capitalize.gsub('_',' ') )
-    elsif options['name']
-      t(label, label)
-    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\./)
-  end
-  # create field object from type option and call its render method
+  label, help = dc_label_help(options)
+  # create field object from type and call its render method
   if options['type'].present?
     klass_string = options['type'].camelize
     field_html = if DrgcmsFormFields.const_defined?(klass_string) # when field type defined
@@ -101,10 +89,57 @@ def dc_field_label_help(options)
   else
     "Error: Field type missing!"
   end
-
   [field_html, label, help]
 end
 
+############################################################################
+# Return label and help text for a field defined on Form.
+#
+# Parameters:
+# options : Hash : Field definition
+#
+# Returns:
+#   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'])
+
+  label = options['caption'] || options['text'] || options['label']
+  label = if label.blank?
+            t_name(options['name'], options['name'].capitalize.gsub('_',' ') )
+          elsif options['name']
+            t(label, label)
+          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\./)
+  [label, help]
+end
+
+############################################################################
+# Return label and help for tab on Form.
+#
+# Parameters:
+# options : String : Tab name on form
+#
+# Returns:
+#   label : String : Label text
+#   help : String : Help text
+############################################################################
+def dc_tab_label_help(tab_name)
+  label = @form['form']['tabs'][tab_name]['caption'] || tab_name
+  label = t(label, t_name(label, label))
+
+  help = @form['form']['tabs'][tab_name]['help'] || "helpers.help.#{@form['table']}.#{tab_name}"
+  help = t(help, t_name(help, help))
+  help = nil if help.match('helpers.') # help not found in translation
+
+  [label, help]
+end
+
 ############################################################################
 # Creates code for including data entry field in index actions.
 ############################################################################
@@ -147,9 +182,10 @@ 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'] ? t("#{yaml['caption'].downcase}", yaml['caption']) : nil
+  caption = yaml['caption'] || yaml['text']
+  caption = caption ? t("#{caption.downcase}", caption) : nil
   icon    = yaml['icon'] ? "#{fa_icon(yaml['icon'])}" : ''
   # action is not active
   unless dc_is_action_active?(yaml)
@@ -158,14 +194,14 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
   # set data-confirm when confirm 
   yaml['html'] ||= {}
   confirm = yaml['html']['data-confirm'] || yaml['confirm']
-  yaml['html']['data-confirm'] = t(confirm) unless confirm.blank?
+  yaml['html']['data-confirm'] = t(confirm) if confirm.present?
   yaml['html']['title'] ||= yaml['title']
-  yaml['html']['title'] = t(yaml['title'])
+  yaml['html']['title'] = t(yaml['title']) if yaml['title'].present?
   yaml['html']['target'] ||= yaml['target']
   # direct url
   if yaml['url']
-    parms['controller'] = yaml['url'] 
-    parms['idr']        = dc_document_path(record) if record
+    parms['url'] = yaml['url']
+    parms['idr'] = dc_document_path(record) if record
   # make url from action controller
   else
     parms['controller'] = yaml['controller'] || 'cmsedit'
@@ -178,16 +214,18 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
   # add current id to parameters
   parms['id'] = dc_document_path(record) if record
   # overwrite with or add additional parameters from environment or record
-  yaml['params'].each { |k,v| parms[k] = dc_value_for_parameter(v) } if yaml['params']
+  yaml['params'].each { |k, v| parms[k] = dc_value_for_parameter(v, record) } if yaml['params']
+
   parms['table'] = parms['table'].underscore if parms['table'] # might be CamelCase
   # error if controller parameter is missing
   if parms['controller'].nil? && parms['url'].nil?
     "<li>#{'Controller not defined'}</li>"
   else
-    yaml['caption'] ||= yaml['text']
+    #yaml['caption'] ||= yaml['text']
     html_data = dc_html_data(yaml['html'])
-    #
     url = url_for(parms) rescue 'URL error'
+    url = nil if parms['url'] == '#'
+
     request = yaml['request'] || yaml['method'] || 'get'
     if yaml['type'] == 'ajax' # ajax button
       clas = "dc-link-ajax dc-animate"
@@ -203,8 +241,8 @@ 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"
-      link = dc_link_to(yaml['caption'], yaml['icon'], parms, html_data )
+      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>]
 
     elsif yaml['type'] == 'window'
@@ -218,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