drg_cms 0.6.0.6 → 0.6.1.4

data/app/models/dc_policy_role.rb

@@ -38,18 +38,29 @@
 # which can be persistent, when application is used as Rails plugin. 
 #########################################################################
 class DcPolicyRole
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field   :name,        type: String
-  field   :system_name, type: String
-  field   :active,      type: Boolean, default: true  
-  
-  index( { name: 1 }, { unique: true } )
-  index( system_name: 1 )
-  
-  validates :name, :length => { :minimum => 4 }  
-  validates :name, uniqueness: true    
+field   :name,        type: String
+field   :system_name, type: String
+field   :active,      type: Boolean, default: true
+
+index( { name: 1 }, { unique: true } )
+index( system_name: 1 )
+
+validates :name, :length => { :minimum => 4 }
+validates :name, uniqueness: true
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_permission)
+  DrgCms.cache_clear(:dc_site)
+end
 
 ########################################################################
 # Return all defined roles as choices for use in select field.

data/app/models/dc_poll.rb

@@ -63,6 +63,7 @@ field :operation,     type: String
 field :parameters,    type: String
 field :display,       type: String, default: '1'
 field :css,           type: String
+field :js,            type: String
 field :form,          type: String
 field :valid_from,    type: DateTime
 field :valid_to,      type: DateTime

data/app/models/dc_poll_result.rb

@@ -29,15 +29,17 @@
 #  _id                  BSON::ObjectId       _id
 #  dc_poll_id           BSON::ObjectId       poll id
 #  data                 String               Data saved as YAML
-# 
+#  confirmed            Boolean              Poll entry was confirmed
+#
 # Results of polls saved as YAML structure.
 ########################################################################
 class DcPollResult
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  field :data,         type: String
   belongs_to :dc_poll
+  field :data,        type: String
+  field :confirmed,   type: Boolean, default: false
 
   index( { dc_poll_id: 1 } )
 

data/app/models/dc_temp.rb

@@ -33,9 +33,11 @@
 class DcTemp
   include Mongoid::Document
   include Mongoid::Timestamps
+  
   field :key,     type: String
   field :data,    type: Hash,     default: {}
   field :active,  type: Time,     default: Time.now
+  field :order,   type: String
   
   index key: 1
   
@@ -44,9 +46,10 @@ class DcTemp
 ########################################################################
 def initialize(parms = {})
   super()
-  parms.stringify_keys!
-  self.key = parms.delete('key')  if parms['key']
-  self.key = parms.delete('active') if parms['active']
+  parms = parms.nil? ? {} : parms.stringify_keys
+  self.key    = parms.delete('key')  if parms['key']
+  self.active = parms.delete('active') if parms['active']
+  self.order  = parms.delete('order') if parms['order']
   parms.each { |k, value| self.data[k] = value }
 end
 

data/app/models/dc_user_role.rb

@@ -57,8 +57,8 @@ class DcUserRole
 # Determine of role is still active
 ###############################################################################
 def active?
-  now = Time.zone.local
-  self.active and (self.valid_from.nil? or now > self.valid_from) and (self.valid_to.nil? or now < self.valid_to)
+  now = Time.current
+  active && (valid_from.nil? || now > valid_from) && (valid_to.nil? || now < valid_to)
 end
 
 end

data/app/models/drgcms_form_fields/date_picker.rb

@@ -67,17 +67,20 @@ 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
+
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
   @js << %Q[

data/app/models/drgcms_form_fields/datetime_picker.rb

@@ -53,16 +53,17 @@ 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')}'"
-# 
+
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
   @js << %Q[

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -128,7 +128,6 @@ end
 # Standard code for returning readonly field.
 ####################################################################
 def ro_standard(value=nil)
-  p @yaml['name'],value
   if value.nil?
     value = if @yaml['html']['value']
       @yaml['html']['value']
@@ -136,7 +135,8 @@ def ro_standard(value=nil)
       @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
     end
   end
-  @html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
+  #@html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
+  @html << %(<div id="#{@yaml['name']}" class="dc-readonly">#{value}</div>)
   self
 end
 
@@ -152,7 +152,7 @@ end
 #    flash[:record] = {}
 #    flash[:record]['picture'] = '/path/to_picture'
 ####################################################################
-def set_initial_value(opt1='html', opt2='value')
+def set_initial_value(opt1 = 'html', opt2 = 'value')
   @yaml['html'] ||= {}
   value_send_as = 'p_' + @yaml['name']
   if @parent.params[value_send_as]
@@ -160,11 +160,26 @@ def set_initial_value(opt1='html', opt2='value')
   elsif @parent.flash[:record] and @parent.flash[:record][@yaml['name']]
     @yaml[opt1][opt2] = @parent.flash[:record][@yaml['name']]
   end
+  set_default_value(opt1, opt2) if @yaml['default']
+end
+
+####################################################################
+# Will set default value
+####################################################################
+def set_default_value(opt1, opt2)
+  return if @yaml[opt1][opt2].present?
+  return if @record && @record[@yaml['name']].present?
+
+  @yaml[opt1][opt2] = if @yaml['default'].class == Hash
+    eval(@yaml['default']['eval'])
+  else
+    @yaml['default']
+  end
 end
 
 ####################################################################
 # Returns style html code for DRGForm object if style directive is present in field definition.
-# Otherwiese returns empty string.
+# Otherwise returns empty string.
 # 
 # Style may be defined like:
 #    style:
@@ -202,7 +217,7 @@ end
 # Returns css code for the field if specified. It replaces all occurences of '# ' 
 # with field name id, as defined on form.
 ####################################################################
-def css_code
+def __css_code
   return '' if @css.blank?
   @css.gsub!('# ',"#td_record_#{@yaml['name']} ")
   "\n<style type=\"text/css\">#{@css}</style>"

data/app/models/drgcms_form_fields/embedded.rb

@@ -31,6 +31,7 @@ module DrgcmsFormFields
 # * +name:+ field name (required)
 # * +type:+ embedded (required)
 # * +form_name:+ name of form which will be used for editing
+# * +load:+ when is embedded iframe loaded. default=on form load, delay=on tab select, always=every time tab is selected)
 # * +html:+ html options (optional)
 #   * +height:+ height of embedded object in pixels (1000)
 #   * +width:+ width of embedded object in pixels (500)
@@ -40,6 +41,7 @@ module DrgcmsFormFields
 #      name: dc_parts
 #      type: embedded
 #      form_name: dc_part
+#      refresh: delay
 #      html:
 #        height: 1000
 ###########################################################################
@@ -47,35 +49,40 @@ class Embedded < DrgcmsField
 ###########################################################################
 # Render embedded field html code
 ###########################################################################
-def render 
-  #return self if @record.new_record?  # would be in error otherwise
-# HTML defaults. Some must be set    
+def render
+  # HTML defaults. Some must be set    
   @yaml['html'] ||= {}
-  @yaml['html']['height'] ||= 300
-  @yaml['html']['width']  ||= '99%'
-# defaults both way 
+  @yaml['html']['width'] ||= '99%'
+  html = @yaml['html'].inject('') { |r, val| r << "#{val.first}=\"#{val.last}\" " }
+
+  @yaml['action'] ||= 'index'
+  # defaults both way 
   @yaml['table']     ||= @yaml['form_name'] if @yaml['form_name']
   @yaml['form_name'] ||= @yaml['table'] if @yaml['table']
-# 
-  html = ''  
-  @yaml['html'].each {|k,v| html << "#{k}=\"#{v}\" "}
-# 
+
   if @yaml['name'] == @yaml['table'] or @yaml['table'] == 'dc_memory'
     tables = @yaml['table']
-    ids = @record._id
+    ids    = @record.id
   else
-    tables      = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
-    ids         = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record._id
+    tables = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
+    ids    = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record.id
   end
-  opts = { controller: 'cmsedit', action: 'index', ids: ids, table: tables, form_name: @yaml['form_name'], 
-           field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: @readonly }
+  # edit enabled embedded form on a readonly form
+  readonly = @yaml['readonly'].class == FalseClass ? nil : @readonly
+  opts = { controller: 'cmsedit', action: @yaml['action'],
+           ids: ids, table: tables, form_name: @yaml['form_name'], 
+           field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: readonly }
   # additional parameters if specified
   @yaml['params'].each { |k,v| opts[k] = @parent.dc_value_for_parameter(v) } if @yaml['params']         
          
   @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 = @yaml['delay'] ? 'data-src-delay' : 'src'
+    data = if @yaml['load'].nil? || @yaml['load'].match('default')
+      "src"
+    else
+      "data-src-#{@yaml['load']}"
+    end
     @js << %Q[
 $(document).ready( function() {
   $('#if_#{@yaml['name']}').attr('#{data}', '#{url}');

data/app/models/drgcms_form_fields/file_field.rb

@@ -43,8 +43,8 @@ class FileField < DrgcmsField
 ###########################################################################
 def render
   return self if @readonly 
-  #record = record_text_for(@yaml['name'])
-  @html << @parent.file_field( @yaml['name'], @yaml['html']) 
+
+  @html << @parent.file_field(nil,@yaml['name'], @yaml['html']) 
   self
 end
 

data/app/models/drgcms_form_fields/file_select.rb

@@ -50,10 +50,10 @@ class FileSelect < DrgcmsField
 ###########################################################################
 def render
   return ro_standard if @readonly  
-# retrieve html editor from page settings
+  # retrieve file_select component from site settings
   selector_string = @parent.dc_get_site.params['file_select'] if @parent.dc_get_site 
   selector_string ||= 'elfinder' 
-# 
+
   klas_string = selector_string.camelize
   if DrgcmsFormFields.const_defined?(klas_string)
     klas = DrgcmsFormFields::const_get(klas_string)

data/app/models/drgcms_form_fields/hash_field.rb

@@ -45,6 +45,7 @@ class HashField < DrgcmsField
 ###########################################################################
 def ro_standard()
   return self if @record[@yaml['name']].nil?
+
   html = ''
   @record[@yaml['name']].each do |key, value|
     html << "#{key}:#{value}<br>"
@@ -57,10 +58,10 @@ end
 ###########################################################################
 def render
   return ro_standard if @readonly
+
   set_initial_value
-#
   record = record_text_for(@yaml['name'])
-# Convert Hash to values separated by colon  
+  # Convert Hash to values separated by colon
   if @record[@yaml['name']]
     @yaml['html']['value'] = @record[@yaml['name']].to_a.inject('') {|r, e| r << "#{e.first}:#{e.last}\n"}
   end
@@ -73,12 +74,15 @@ end
 ###########################################################################
 def self.get_data(params, name)
   return nil if params['record'][name].blank?
-#
-  result = params['record'][name].split("\n").select {|e| !e.blank? }
-  return nil if result.size == 0
-# convert to Hash
+
+  result = params['record'][name].split("\n").select { |e| !e.blank? }
+  return if result.size == 0
+  # convert to Hash
   ret = {}
-  result.map { |e| key,value = e.chomp.split(':'); ret[key.strip] = value.strip unless value.blank? }
+  result.map do |e|
+    key, value = e.chomp.split(':')
+    ret[key.strip] = value.strip if value.present?
+  end
   ret
 end
 

data/app/models/drgcms_form_fields/hidden_field.rb

@@ -42,7 +42,7 @@ class HiddenField < DrgcmsField
 ###########################################################################
 def render 
   set_initial_value
-  value = @yaml['html']['value'] ? @yaml['html']['value'] : @record[@yaml['name']]
+  value = @yaml['html']['value'] ? @yaml['html']['value'] : @record.send(@yaml['name'])
   record = record_text_for(@yaml['name'])  
   @parent.hidden_field(record, @yaml['name'], value: value)
 end

data/app/models/drgcms_form_fields/link_to.rb

@@ -53,13 +53,13 @@ def render
   @yaml['html'] ||= {}
   @yaml['html']['class'] ||= 'dc-link dc-animate'
   @yaml['html'].symbolize_keys!
-#
+
   @yaml[:id] = record._id if @yaml[:id] == 'id'
   url = @yaml['url'] || "#{@yaml[:controller]}/#{@yaml[:action]}/#{@yaml[:id]}"
   url.gsub!('//','/')                             # no action and id
   url = '/' + @yaml['url'] unless url[0,1] == '/' # no leading /
   url.chop if url[0,-1] == '/'                    # remove trailing /
-#
+
   caption = @yaml['caption'] || @yaml['text']
   @html << @parent.dc_link_to(caption, @yaml['icon'], url, @yaml['html'])
   self

data/app/models/drgcms_form_fields/method.rb

@@ -0,0 +1,66 @@
+#--
+# Copyright (c) 2012+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+module DrgcmsFormFields
+
+###########################################################################
+# Implementation of custom DRG CMS form field. Method field will call method or class method
+# defined in eval option and add returned code to HTML output code.
+#
+# It can be used in case when form contains complex data structure. For example set of pictures which can not
+# be simply displayed by any other DRG Forms field.
+#   
+# Form example:
+#    50:
+#      name: galery
+#      type: method
+#      eval: show_gallery
+#      or
+#      eval: MyClass.show_gallery
+#      
+###########################################################################
+class Method < DrgcmsField
+
+###########################################################################
+# Render file_select field html code
+###########################################################################
+def render
+  # might be defined as my_method or MyClass.my_method
+  clas, method = @yaml['eval'].split(/\.|\,/).map(&:strip)
+  if method.nil?
+    if @parent.respond_to?(clas)
+      @html << @parent.send(clas, @record, @yaml, @readonly) 
+      return self
+    end
+  else
+    klass = clas.camelize.constantize
+    if klass.respond_to?(method)
+      @html << klass.send(method, @record, @yaml, @readonly) 
+      return self
+    end
+  end   
+  @html << "Error: #{@yaml['name']} : #{@yaml['eval']} not defined!"
+  self
+end
+
+end
+end

data/app/models/drgcms_form_fields/multitext_autocomplete.rb

@@ -23,7 +23,7 @@
 module DrgcmsFormFields
 
 ###########################################################################
-# Implementation of multitext_autocomplete DRG CMS form field.
+# 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
@@ -33,20 +33,21 @@ module DrgcmsFormFields
 # ===Form options:
 # * +name:+ field name (required)
 # * +type:+ multitext_autocomplete (required)
-# * +table+ Collection (table) name. When defined search must contain field name
+# * +table+ Model (table) name which must contain searched field name.
 # * +search:+ Search may consist of three parameters from which are separated either by dot (.) or comma(,)
 #   * search_field_name; when table option is defined search must define field name which will be used for search query
 #   * collection_name.search_field_name; Same as above except that table options must be ommited.
 #   * 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      
-#        html:
-#          size: 30
+#        with_new: model_name
+#        size: 30
 ###########################################################################
 class MultitextAutocomplete < DrgcmsField
 
@@ -76,7 +77,7 @@ def render
     method   = @yaml['search']['method']
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   elsif @yaml['search'].to_s.match(/\./)
-    table, field_name, method = @yaml['search'].split(/\.|\,/) 
+    table, field_name, method = @yaml['search'].split(/\.|\,/).map(&:strip)
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   else # search and table name are separated
     search = field_name = @yaml['search']
@@ -89,7 +90,7 @@ def render
     elsif @yaml['table']['eval']
       eval @yaml['table']['eval']
     else
-      p "Field #{@yaml['name']}: Invalid table parameter!"
+      @parent.logger.error "Field #{@yaml['name']}: Invalid table parameter!"
       nil
     end
   end
@@ -97,15 +98,14 @@ def render
     @html << 'Table or search field not defined!' 
     return self
   end
-# 
-  #return ro_standard(table, search) if @readonly
-# 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']}" 
     return self
   end
-# put field to enter search data on form
+  # put field to enter search data on form
   @yaml['html'] ||= {}
   @yaml['html']['value'] = ''   # must be. Otherwise it will look into record and return error
   @yaml['html']['placeholder'] = t('drgcms.search_placeholder')
@@ -115,10 +115,16 @@ def render
 
   record = record_text_for(@yaml['name'])
   # text field for autocomplete
-  @html << ' ' << @parent.text_field(record, _name, @yaml['html'])
+  @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 << ' ' + 
+             @parent.fa_icon('plus-square lg', class: 'in-edit-add', title: t('drgcms.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 

data/app/models/drgcms_form_fields/number_field.rb

@@ -69,14 +69,14 @@ def render
   @yaml['html']['data-delimiter'] = @yaml.dig('format','delimiter') || I18n.t('number.currency.format.delimiter')
   @yaml['html']['data-separator'] = @yaml.dig('format','separator') || I18n.t('number.currency.format.separator')
  # @yaml['html']['data-currency']  = @yaml.dig('format','currency') == 'yes' ? I18n.t('number.currency.format.currency') : @yaml.dig('format','currency')
-  value = @record[@yaml['name']] || 0 
+  value = @yaml['html']['value'] || @record[@yaml['name']] || 0
   @yaml['html']['value'] = @parent.dc_format_number(value, @yaml['html']['data-decimal'], @yaml['html']['data-separator'], @yaml['html']['data-delimiter'] )
   
   return ro_standard(@yaml['html']['value']) if @readonly
 
   @yaml['html']['autocomplete'] ||= 'off'
   @html << @parent.hidden_field( record, @yaml['name'], value: value )
-  @html << @parent.text_field( nil,"record_#{@yaml['name']}_", @yaml['html']) 
+  @html << @parent.text_field( nil, "record_#{@yaml['name']}_", @yaml['html'])
   self
 end
 
@@ -85,7 +85,8 @@ end
 ###########################################################################
 def self.get_data(params, name)
   return 0 if params['record'][name].blank?
-  params['record'][name].match('.') ? params['record'][name].to_f : Integer.new(params['record'][name])
+
+  params['record'][name].match('.') ? params['record'][name].to_f : params['record'][name].to_i
 end
 
 end

data/app/models/drgcms_form_fields/radio.rb

@@ -61,10 +61,9 @@ module DrgcmsFormFields
 class Radio < Select
 
 ###########################################################################
-# Render text_with_select field html code
+# Render radio DRG Form field
 ###########################################################################
 def render
-  #return ro_standard if @readonly  
   set_initial_value('html','value')
   
   record = record_text_for(@yaml['name'])
@@ -73,13 +72,19 @@ def render
   @html << "<div class=\"#{clas}\">"
   choices = get_choices
   # When error and boolean field
-  if choices.size == 1 and (@record[@yaml['name']].class == TrueClass or @record[@yaml['name']].class == FalseClass)
-    choices = [[I18n.t('drgcms.true'), true], [I18n.t('drgcms.false'), false]] 
+  #if choices.size == 1 and (@record[@yaml['name']].class == TrueClass or @record[@yaml['name']].class == FalseClass)
+  #  choices = [[I18n.t('drgcms.true'), true], [I18n.t('drgcms.false'), false]]
+  #end
+  # Should select first button if no value provided
+  value = if @record.nil? || @record[@yaml['name']].blank?
+    choices.first.class == String ? choices.first :  choices.first.last
+  else
+    @record[@yaml['name']]
   end
   choices.each do |choice|
     choice = [choice, choice] if choice.class == String
     @html << "<div>"
-    @html << @parent.radio_button_tag("#{record}[#{@yaml['name']}]",choice.last, choice.last.to_s == @record[@yaml['name']].to_s)
+    @html << @parent.radio_button_tag("#{record}[#{@yaml['name']}]",choice.last, choice.last.to_s == value.to_s)
     @html << choice.first
     @html << "</div>"
   end

data/app/models/drgcms_form_fields/readonly.rb

@@ -51,29 +51,25 @@ class Readonly < DrgcmsField
 ###########################################################################
 # Render readonly field html code
 ###########################################################################
-def render 
+def render
   @html << @parent.hidden_field('record', @yaml['name']) # retain field as hidden field
   @html << '<div class="dc-readonly">'
-  
+
   @html << if @yaml['eval']
-    if @yaml['eval'].match('dc_name4_id')
-      a = @yaml['eval'].split(',')
-      if a.size == 3
-        @parent.dc_name4_id(a[1], a[2], nil, @record[ @yaml['name'] ])
-      else
-        @parent.dc_name4_id(a[1], a[2], a[3], @record[ @yaml['name'] ])
-      end
-      
-#      @parent.dc_name4_id(a[1], a[2], @record[ @yaml['name'] ])
-    else
-      eval( "#{@yaml['eval']} '#{@record[ @yaml['name'] ]}'") 
-    end
-  else
-    @parent.dc_format_value(@record.send(@yaml['name']),@yaml['format'])    
-  end  
+             if @yaml['eval'].match(/dc_name4_id|dc_name_for_id/)
+               parms = @parent.dc_eval_to_array(@yaml['eval'])
+               parms << nil if parms.size == 3
+               @parent.dc_name_for_id(parms[1], parms[2], parms[3], @record[@yaml['name']])
+             else
+               eval( "#{@yaml['eval']} '#{@record.send(@yaml['name'])}'")
+             end
+           else
+             @parent.dc_format_value(@record.send(@yaml['name']), @yaml['format'])
+           end
   @html << '</div>'
   self
 end
+
 end
 
 end