drg_cms 0.6.1.11 → 0.7.0.8

data/app/models/dc_policy_role.rb

@@ -55,30 +55,30 @@ after_save :cache_clear
 after_destroy :cache_clear
 
 ####################################################################
-# Clear cache if cache is configured
+# Clear cache when cache is configured
 ####################################################################
 def cache_clear
   DrgCms.cache_clear(:dc_permission)
   DrgCms.cache_clear(:dc_site)
+  DrgCms.cache_clear(:dc_policy_role)
 end
 
 ########################################################################
 # Return all defined roles as choices for use in select field.
 ########################################################################
 def self.choices4_roles
-  where(active: true).order_by(name: 1).inject([]) { |r,role| r << [ role.name, role._id] }
+  where(active: true).order_by(name: 1).inject([]) { |r, role| r << [ role.name, role._id] }
 end
 
 ########################################################################
 # Search for role when role parameter is String.
 ########################################################################
 def self.get_role(role)
-  if role.class == String
-    rol = role
-    role = find_by(name: rol) || find_by(system_name: rol)
-  end
-  role
-end
+  doc = DrgCms.cache_read(['dc_policy_role', role])
+  return doc if doc
 
+  doc = find_by(name: role) || find_by(system_name: role)
+  DrgCms.cache_write(['dc_policy_role', role], doc)
+end
 
 end

data/app/models/drgcms_form_fields/date_picker.rb

@@ -66,30 +66,28 @@ class DatePicker < DrgcmsField
 ###########################################################################
 def render
   value = @record.try(@yaml['name']) ? I18n.localize(@record[@yaml['name']].to_date) : nil
-  #return ro_standard( @parent.dc_format_value(value)) if @readonly
-
-  @yaml['options'] ||= {}
   set_initial_value
   @yaml['html']['size'] ||= @yaml['size'] || 10
   @yaml['html']['value'] ||= value
   @yaml['html']['autocomplete'] ||= 'off'
   @yaml['html']['class'] = @yaml['html']['class'].to_s + ' date-picker'
 
-  @yaml['options']['lang']   ||= "'#{I18n.locale}'"
-  @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.date')}'"
-  @yaml['options']['timepicker'] = false
-  @yaml['options']['scrollMonth'] ||= false
-  @yaml['options']['scrollInput'] ||= false
+  options = options_to_hash(@yaml['options'])
+  options['lang']   ||= I18n.locale.to_s
+  options['format'] ||= t('datetimepicker.formats.date')
+  options['timepicker'] = false
+  options['scrollMonth'] ||= false
+  options['scrollInput'] ||= false
 
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
-  @js << %Q[
+  @js << %(
 $(document).ready(function() {
-  $("##{record}_#{@yaml['name']}").datetimepicker( {
-    #{hash_to_options(@yaml['options'])}
+  $("##{record}_#{@yaml['name']}").datetimepicker({
+    #{hash_to_options(options)}
   });
 });
-] unless @readonly
+) unless @readonly
   
   self
 end

data/app/models/drgcms_form_fields/datetime_picker.rb

@@ -30,12 +30,12 @@ module DrgcmsFormFields
 # * +name:+ Field name (required) 
 # * +options:+ options which apply to date_picker field. All options can be found here http://xdsoft.net/jqplugins/datetimepicker/ .
 # Options can be defined in single line like:
-# * options: 'step: 15,inline: true,lang: "sl"' or
+# * options: 'step: 15,inline: true,lang: sl' or
 # 
 # * options: 
 #   * step: 15
 #   * inline: true
-#   * lang: '"sl"'
+#   * lang: sl
 #   
 # * +html:+ html options which apply to date_time_picker field (optional)
 # 
@@ -52,27 +52,26 @@ class DatetimePicker < DrgcmsField
 ###########################################################################
 def render
   value = @record.try(@yaml['name']) ? I18n.localize(@record[@yaml['name']].localtime) : nil
-  #return ro_standard( @parent.dc_format_value(value)) if @readonly
-
-  @yaml['options'] ||= {}
   set_initial_value
+
   @yaml['html']['size'] ||= @yaml['size'] || 14
   @yaml['html']['value'] ||= value if @record[@yaml['name']]
   @yaml['html']['autocomplete'] ||= 'off'
   @yaml['html']['class'] = @yaml['html']['class'].to_s + ' date-picker'
 
-  @yaml['options']['lang']   ||= "'#{I18n.locale}'"
-  @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.datetime')}'"
+  options = options_to_hash(@yaml['options'])
+  options['lang']   ||= I18n.locale.to_s
+  options['format'] ||= t('datetimepicker.formats.datetime')
 
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
-  @js << %Q[
+  @js << %(
 $(document).ready(function() {
-  $("##{record}_#{@yaml['name']}").datetimepicker( {
-    #{hash_to_options(@yaml['options'])}
+  $("##{record}_#{@yaml['name']}").datetimepicker({
+    #{hash_to_options(options)}
   });
 }); 
-] unless @readonly
+) unless @readonly
   
   self
 end

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -114,11 +114,11 @@ end
 # Returns: 
 # String. Translated text. 
 ####################################################################
-def t(key, default='')
+def t(key, default = '')
   c = I18n.t(key)
-  if c.match( 'translation missing' )
+  if c.match(/translation missing/i)
     c = I18n.t(key, locale: 'en') 
-# Still not found. Return default if set
+    # Still not found. Return default if set
     c = default unless default.blank?
   end
   c
@@ -127,15 +127,8 @@ end
 ####################################################################
 # Standard code for returning readonly field.
 ####################################################################
-def ro_standard(value=nil)
-  if value.nil?
-    value = if @yaml['html']['value']
-      @yaml['html']['value']
-    else
-      @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
-    end
-  end
-  #@html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
+def ro_standard(value = nil)
+  value ||= @yaml['html']['value'] || (@record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil)
   @html << %(<div id="#{@yaml['name']}" class="dc-readonly">#{value}</div>)
   self
 end
@@ -157,8 +150,9 @@ def set_initial_value(opt1 = 'html', opt2 = 'value')
   value_send_as = 'p_' + @yaml['name']
   if @parent.params[value_send_as]
     @yaml[opt1][opt2] = @parent.params[value_send_as] 
-  elsif @parent.flash[:record] and @parent.flash[:record][@yaml['name']]
-    @yaml[opt1][opt2] = @parent.flash[:record][@yaml['name']]
+  elsif @parent.flash[:record]
+    value = @parent.flash[:record][@yaml['name']] || @parent.flash[:record][@yaml['name'].to_sym]
+    @yaml[opt1][opt2] = value if value
   end
   set_default_value(opt1, opt2) if @yaml['default']
 end
@@ -217,24 +211,13 @@ def set_style()
   end 
 end
 
-####################################################################
-# DEPRECATED!
-#  
-# Returns css code for the field if specified. It replaces all occurences of '# ' 
-# with field name id, as defined on form.
-####################################################################
-def __css_code
-  return '' if @css.blank?
-  @css.gsub!('# ',"#td_record_#{@yaml['name']} ")
-  "\n<style type=\"text/css\">#{@css}</style>"
-end
-
 ####################################################################
 # Sets css code for the field if specified. It replaces all occurences of '# ' 
 # with field name id, as defined on form.
 ####################################################################
 def set_css_code(css)
   return '' if css.blank?
+
   css.gsub!('# ',"#td_record_#{@yaml['name']} ") if css.match('# ')
   css
 end
@@ -250,16 +233,58 @@ end
 #    options:
 #      height: 400
 #      width: 800
-#      toolbar: "'basic'"
+#      toolbar: "basic"
 #      
-#  => "height:400, width:800, toolbar:'basic'"
+#  => "height:400, width:800, toolbar: 'basic'"
 # 
 # Return: 
 # String: Options formated as javascript options.
 #      
 ####################################################################
-def hash_to_options(hash)
-  hash.to_a.inject([]) {|r,v| r << "#{v[0]}: #{v[1]}" }.join(',')
+def hash_to_options(options)
+  c = ''
+  options.each do |key, option|
+    c << "#{key} : "
+    c << case
+         when option.to_s.match(/function/i) then option
+         when option.class == String then "\"#{option}\""
+         else option.to_s
+         end
+    c << ",\n"
+  end
+  c
+end
+
+####################################################################
+# Options may be defined on form as hash or as string. This method will
+# ensure conversion of options into hash.
+#
+# Parameters:
+# [String or Hash] : Form options
+#
+# Form example: As used in forms
+#    options:
+#      height: 400
+#      width: 800
+#      toolbar: "'basic'"
+#  or
+#
+#  options: "height:400, width:800, toolbar:'basic'"
+#
+# Return:
+# Hash: Options as Hash
+####################################################################
+def options_to_hash(options)
+  return {} if options.nil?
+  return options unless options.class == String
+
+  options.chomp.split(',').inject({}) do |r, e|
+    key, value = e.chomp.split(':')
+    value.strip!
+    value = value[1..value.size - 2] if value[0] =~ /\'|\"/
+    r[key.strip] = value
+    r
+  end
 end
 
 ####################################################################

data/app/models/drgcms_form_fields/embedded.rb

@@ -78,15 +78,18 @@ def render
   @html << "<iframe class='iframe_embedded' id='if_#{@yaml['name']}' name='if_#{@yaml['name']}' #{html}></iframe>"
   unless @record.new_record?
     url  = @parent.url_for(opts)
-    data = if @yaml['load'].nil? || @yaml['load'].match('default')
-      "src"
-    else
-      "data-src-#{@yaml['load']}"
-    end
-    @js << %Q[
+    attributes = case
+                 when @yaml['load'].nil? || @yaml['load'].match('default')
+                   "'src', '#{url}'"
+                 when @yaml['load'].match('delay')
+                   "'data-src-#{@yaml['load']}', '#{url}'"
+                 when @yaml['load'].match('always')
+                   "{'data-src-#{@yaml['load']}': '#{url}', src: '#{url}'}"
+                 end
+    @js << %(
 $(document).ready( function() {
-  $('#if_#{@yaml['name']}').attr('#{data}', '#{url}');
-});]
+  $('#if_#{@yaml['name']}').attr(#{attributes});
+});)
   end
   self
 end

data/app/models/drgcms_form_fields/journal_diff.rb

@@ -49,8 +49,8 @@ def render
     old_value = v.class == Array ? v[0] : v
     new_value = v.class == Array ? v[1] : v
     @html << "<div style='background-color: #eee;'>#{@parent.check_box('select', k)} #{k}</div>
-              <div style='background-color: #fcc;'>-<br>#{old_value}</div>
-              <div style='background-color: #cfc;'>+<br>#{new_value}</div><br>"
+              <div style='background-color: #fcc;'>-<br>#{old_value.to_s.gsub("\n", '<br>')}</div>
+              <div style='background-color: #cfc;'>+<br>#{new_value.to_s.gsub("\n", '<br>')}</div><br>"
   end
   @html << '</div>'
   self

data/app/models/drgcms_form_fields/multitext_autocomplete.rb

@@ -24,12 +24,12 @@ module DrgcmsFormFields
 
 ###########################################################################
 # Implementation of multitext_autocomplete DRG Form field.
-# 
+#
 # multitext_autocomplete field is complex data entry field which uses autocomplete
 # function when selecting multiple values for MongoDB Array field. Array typically holds
-# id's of selected documents and control typically displays value of the field name 
+# id's of selected documents and control typically displays value of the field name
 # defined by search options.
-# 
+#
 # ===Form options:
 # * +name:+ field name (required)
 # * +type:+ multitext_autocomplete (required)
@@ -40,12 +40,12 @@ module DrgcmsFormFields
 #   * collection_name.search_field_name.method_name; When searching is more complex custom search
 #   method may be defined in CollectionName model which will provide result set for search.
 # * +with_new+ Will add an icon for shortcut to add new document to collection
-#      
+#
 # Form example:
 #      90:
 #        name: kats
 #        type: multitext_autocomplete
-#        search: dc_category.name      
+#        search: dc_category.name
 #        with_new: model_name
 #        size: 30
 ###########################################################################
@@ -55,10 +55,11 @@ class MultitextAutocomplete < DrgcmsField
 # Returns value for readonly field
 ###########################################################################
 def ro_standard(table, search)
-  result = ''
-  table = table.classify.constantize
   return self if @record[@yaml['name']].nil?
-# when field name and method are defined together
+
+  result = ''
+  table  = table.classify.constantize
+  # when field name and method are defined together
   search = search.split('.').first if search.match('.')
   @record[@yaml['name']].each do |element|
     result << table.find(element)[search] + '<br>'
@@ -69,8 +70,8 @@ end
 ###########################################################################
 # Render multitext_autocomplete field html code
 ###########################################################################
-def render 
-# search field name
+def render
+  # get field name
   if @yaml['search'].class == Hash
     table    = @yaml['search']['table']
     field_name = @yaml['search']['field']
@@ -82,27 +83,28 @@ def render
   else # search and table name are separated
     search = field_name = @yaml['search']
   end
-# determine table name 
+  # get table name
   if @yaml['table']
     table = if @yaml['table'].class == String
-      @yaml['table']
-# eval(how_to_get_my_table_name)    
-    elsif @yaml['table']['eval']
-      eval @yaml['table']['eval']
-    else
-      @parent.logger.error "Field #{@yaml['name']}: Invalid table parameter!"
-      nil
-    end
+              @yaml['table']
+            # eval(how_to_get_my_table_name)
+            elsif @yaml['table']['eval']
+              eval @yaml['table']['eval']
+            else
+              Rails.logger.error "Field #{@yaml['name']}: Invalid table parameter!"
+              nil
+            end
   end
-  unless (table and search)
-    @html << 'Table or search field not defined!' 
+
+  if table.blank? || search.blank?
+    @html << 'Table or search field not defined!'
     return self
   end
-  # 
-  # TODO check if table exists    
+
+  # TODO check if table exists
   collection = table.classify.constantize
   unless @record.respond_to?(@yaml['name'])
-    @html << "Invalid field name: #{@yaml['name']}" 
+    @html << "Invalid field name: #{@yaml['name']}"
     return self
   end
   # put field to enter search data on form
@@ -117,44 +119,44 @@ def render
   # text field for autocomplete
   @html << '<span class="dc-text-autocomplete">' << @parent.text_field(record, _name, @yaml['html']) << '<span></span></span>'
   # direct link for adding new documents to collection
-  if @yaml['with_new'] and !@readonly
-    @html << ' ' + 
+  if @yaml['with_new'] && !@readonly
+    @html << ' ' +
              @parent.fa_icon('plus-square-o', class: 'in-edit-add', title: t('drgcms.new'),
-             style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
+             style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )
   end
   # div to list active selections
   @html << "<div id =\"#{record}#{@yaml['name']}\">"
-  # find value for each field inside categories 
+  # find value for each field inside categories
   unless @record[@yaml['name']].nil?
     @record[@yaml['name']].each do |element|
-# this is quick and dirty trick. We have model dc_big_table which can be used for retrive 
-# more complicated options
+  # this is quick and dirty trick. We have model dc_big_table which can be used for retrive
+  # more complicated options
 # TODO retrieve choices from big_table
       rec = if table == 'dc_big_table'
         collection.find(@yaml['name'], @parent.session)
       else
         collection.find(element)
       end
-# Related data is missing. It happends.
+      # Related data is missing. It happends.
       @html << if rec
         link  = @parent.link_to(@parent.fa_icon('remove_circle', class: 'dc-red'), '#',
-                onclick: "$('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
+                onclick: %($('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val("-" + v.val());return false;))
         link  = @parent.fa_icon('check', class: 'dc-green') if @readonly
         field = @parent.hidden_field(record, "#{@yaml['name']}_#{rec.id}", value: element)
-        "<div id=\"#{rec.id}\" style=\"padding:4px;\">#{link} #{rec.send(field_name)}<br>#{field}</div>"
+        %(<div id="#{rec.id}" style="padding:4px;">#{link} #{rec.send(field_name)}<br>#{field}</div>)
       else
         '** error **'
       end
     end
   end
   @html << "</div></div>"
-# Create text for div to be added when new category is selected  
+  # Create text for div to be added when new category is selected
   link    = @parent.link_to(@parent.fa_icon('remove_circle', class: 'dc-red'), '#',
             onclick: "$('#rec_id').hide(); var v = $('##{record}_#{@yaml['name']}_rec_id'); v.val(\"-\" + v.val());return false;")
   field   = @parent.hidden_field(record, "#{@yaml['name']}_rec_id", value: 'rec_id')
   one_div = "<div id=\"rec_id\" style=\"padding:4px;\">#{link} rec_search<br>#{field}</div>"
-    
-# JS stuff    
+
+  # JS stuff
   @js << <<EOJS
 $(document).ready(function() {
   $("##{record}_#{_name}").autocomplete( {
@@ -173,10 +175,12 @@ $(document).ready(function() {
     },
     change: function (event, ui) { 
       var div = '#{one_div}';
-      div = div.replace(/rec_id/g, ui.item.id)
-      div = div.replace('rec_search', ui.item.value)
-      $("##{record}#{@yaml['name']}").append(div);
-      $("##{record}_#{_name}").val('');
+      if (ui.item != null) { 
+        div = div.replace(/rec_id/g, ui.item.id)
+        div = div.replace('rec_search', ui.item.value)
+        $("##{record}#{@yaml['name']}").append(div);
+        $("##{record}_#{_name}").val('');
+      }
       $("##{record}_#{_name}").focus();
     },
     minLength: 2
@@ -184,20 +188,20 @@ $(document).ready(function() {
 });
 EOJS
 
-  self 
+  self
 end
 
 ###########################################################################
-# Class method for retrieving data from multitext_autocomplete form field.
+# Class method for retrieving data from multitext_autocomplete form field. Values are sabed
+# in parameters as name_id => id
 ###########################################################################
 def self.get_data(params, name)
   r = []
-  params['record'].each do |k,v| 
-# if it starts with - then it was removed
-    r << BSON::ObjectId.from_string(v) if k.match("#{name}_") and v[0,1] != '-'
+  params['record'].each do |k, v|
+    # if it starts with - then it was removed
+    r << BSON::ObjectId.from_string(v) if k.starts_with?("#{name}_") && v[0] != '-'
   end
-  r.uniq!
-  r
+  r.uniq
 end
 
 end

data/app/models/drgcms_form_fields/select.rb

@@ -80,9 +80,9 @@ class Select < DrgcmsField
 def choices_in_helper(helper = nil)
   helper ||= "helpers.label.#{@form['table']}.choices4_#{@yaml['name']}"
   c = t(helper)
-  if c.match( 'translation missing' )
+  if c.match(/translation missing/i)
     helper = "choices_for_#{@form['table']}_#{@yaml['name']}"
-    return "Error. #{helper} not defined" if c.match( 'translation missing' )
+    return "Error. #{helper} not defined" if c.match(/translation missing/i)
   end
   c
 end
@@ -95,21 +95,27 @@ def choices_in_eval(e)
   e.strip!
   if @yaml['depend'].nil?
     method = e.split(/\ |\(/).first
-    return eval(e) if respond_to?(method) # id method defined here
-    return eval('@parent.' + e) if @parent.respond_to?(method) # is method defined in helpers
+    return eval(e) if respond_to?(method) # is method defined here
+    return eval('@parent.' + e) if @parent.respond_to?(method) # is method defined in helper methods
     # eval whatever it is there
     eval e
   else
-    # add event listener to depend field
-    @js << %(
-$(document).ready(function() {
-  $('#record_#{@yaml['depend']}').change( function(e) { update_select_depend('record_#{@yaml['name']}', 'record_#{@yaml['depend']}','#{e}');});
-  $('#_record_#{@yaml['depend']}').change( function(e) { update_select_depend('record_#{@yaml['name']}', '_record_#{@yaml['depend']}','#{e}');});
-});
+    # add event listener to depend field(s)
+    depend_value = ''
+    @js << "\n$(document).ready(function() {\n"
+    @yaml['depend'].split(',') do |depend|
+      depend.strip!
+      depend_value << ',' if depend_value.present?
+      # depend field might be virtual field. It's value should be set in params
+      depend_value << (depend[0] == '_' ? @parent.params["p_#{depend}"] : @record[depend]).to_s
+      next if depend == @yaml['name'] # self may be sent, but don't listen to change event
+
+      @js << %(
+$('#record_#{depend}').change( function(e) { update_select_depend('record_#{@yaml['name']}', '#{@yaml['depend']}', '#{e}');});
+$('#_record_#{depend}').change( function(e) { update_select_depend('record_#{@yaml['name']}', '#{@yaml['depend']}', '#{e}');});
 )
-    # depend field might be virtual field. It's value should be set in params
-    depend_value = @yaml['depend'][0] == '_' ? @parent.params["p_#{@yaml['depend']}"] : @record[@yaml['depend']]
-
+    end
+    @js <<  + "});\n"
     e << " '#{depend_value}'"
     eval e
   end
@@ -132,7 +138,7 @@ def get_choices
 
     choices.chomp.split(',').map { |e| e.match(':') ? e.split(':') : e }
   rescue Exception => e
-    Rails.logger.debug "\nError in select eval. #{e.message}\n"
+    Rails.logger.error "\nError in select eval. #{e.message}\n"
     Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
     ['error'] # return empty array when error occures
   end

data/app/models/drgcms_form_fields/text_with_select.rb

@@ -65,9 +65,7 @@ class TextWithSelect < Select
 # Render text_with_select field html code
 ###########################################################################
 def render
-  #return ro_standard if @readonly  
-  set_initial_value('html','value')
-  
+  set_initial_value
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field( record, @yaml['name'], @yaml['html']) 
   @yaml['html']['class'] ||= ''
@@ -80,13 +78,11 @@ def render
   # javascript to update text field if new value is selected in select field
   @js =<<EOJS
 $(document).ready(function() {
- $('##{@yaml['name']}_').change( function() {
-  if ($(this).val().toString().length > 0) {
-    $('##{record}_#{@yaml['name']}').val( $(this).val() );
+  $('##{@yaml['name']}_').on("click", function() {
+    $('##{record}_#{@yaml['name']}').val( $(this).val().toString() );
     $('##{record}_#{@yaml['name']}').trigger("change");
-  }
-  $('##{record}_#{@yaml['name']}').focus();
- });
+    $('##{record}_#{@yaml['name']}').focus();
+  });
 });
 EOJS
   self