drg_cms 0.7.0.8 → 0.7.1.1

data/app/helpers/dc_application_helper.rb

@@ -855,10 +855,10 @@ def dc_user_can_view(ctrl, policy_id)
   policies = if site.inherit_policy.blank? 
     site.dc_policies
   else
-    Mongoid::QueryCache.cache { DcSite.find(site.inherit_policy) }.dc_policies
+    Mongo::QueryCache.cache { DcSite.find(site.inherit_policy) }.dc_policies
   end
   # permission defined by default policy
-  default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
+  default_policy = Mongo::QueryCache.cache { policies.find_by(is_default: true) }
   return cache_add(policy_id, false, 'Default access policy not found for the site!') unless default_policy
 
   permissions = {}
@@ -866,14 +866,14 @@ def dc_user_can_view(ctrl, policy_id)
   # update permissions with defined policy
   part_policy = nil
   if policy_id
-    part_policy = Mongoid::QueryCache.cache { policies.find(policy_id) }
+    part_policy = Mongo::QueryCache.cache { policies.find(policy_id) }
     return cache_add(policy_id, false, 'Access policy not found for part!') unless part_policy
 
     part_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
   end
   # apply guest role if no roles defined
   if ctrl.session[:user_roles].nil?
-    role = Mongoid::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
+    role = Mongo::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
     return cache_add(policy_id, false, 'System guest role not defined!') unless role
 
     ctrl.session[:user_roles] = [role.id]
@@ -999,7 +999,15 @@ def dc_big_table(key)
     desc = v.value if desc.blank?       # still blank. Use value as description
     ret << [desc, v.value] 
   end
-  ret
+  ret.sort_alphabetical_by(&:first)
+end
+
+########################################################################
+# Will return name for value defined in dc_big_table
+########################################################################
+def dc_big_table_name_for_value(key, value)
+  dc_big_table(key).each { |k, val| return k if val.to_s == value.to_s}
+  '???'
 end
 
 ########################################################################
@@ -1110,12 +1118,12 @@ end
 # Returns:
 # HTML data to be embedded into page header
 #######################################################################
-def dc_get_json_ld()
-  return '' if @json_ld.nil? or @json_ld.size == 0
+def dc_get_json_ld
+  return '' if @json_ld.blank?
 
   %(
 <script type="application/ld+json">
-#{JSON.pretty_generate({'@context' => 'http://schema.org', '@graph' => @json_ld})}
+#{JSON.pretty_generate({ '@context' => 'http://schema.org', '@graph' => @json_ld })}
 </script>).html_safe
 end
 
@@ -1135,21 +1143,40 @@ def dc_add_json_ld(element)
 end
 
 ########################################################################
-# Will return meta data for SEO optimizations
+# Will return meta data for SEO optimizations.
+# It will also create special link rel="canonical" tag if defined in meta tags or page document.
 # 
 # Returns:
 # HTML data to be embedded into page header
 #######################################################################
 def dc_get_seo_meta_tags
   html = ''
-  html << %(<link rel="canonical" href="#{@page.canonical_link}">\n  ) if @page&.canonical_link.present?
-
-  html << @meta_tags.inject('') do |r, hash|
-    r << %(<meta #{hash.first} content="#{hash.last}">\n  )
+  has_canonical = false
+  html << @meta_tags.inject('') do |r, tag|
+    r << if tag.first.match('canonical')
+           has_canonical = true
+           dc_get_link_canonical_tag(tag.last)
+         else
+           %(<meta #{tag.first} content="#{tag.last}">\n  )
+         end
   end if @meta_tags
+  html << dc_get_link_canonical_tag(@page&.canonical_link) unless has_canonical
   html.html_safe
 end
 
+########################################################################
+# helper for setting canonical link on the page
+#######################################################################
+def dc_get_link_canonical_tag(href = nil)
+  return %(<link rel="canonical" href="#{request.url}">\n) if href.blank?
+
+  unless href.match(/^http/i)
+    uri  = URI.parse(request.url)
+    href = "#{uri.scheme}://#{uri.host}/#{href.delete_prefix('/')}"
+  end
+  %(<link rel="canonical" href="#{href}">\n)
+end
+
 ########################################################################
 # Will add a meta tag to internal hash structure. If meta tag already exists it
 # will be overwritten.
@@ -1178,7 +1205,7 @@ end
 # Returns:
 # [String] alt="image-tag"
 #######################################################################
-def dc_img_alt_tag(file_name, text=nil)
+def dc_img_alt_tag(file_name, text = nil)
   %( alt="#{dc_img_alt(file_name, text)}" ).html_safe
 end
 
@@ -1194,7 +1221,7 @@ end
 # Returns:
 # [String] alt_image_name
 #######################################################################
-def dc_img_alt(file_name, text=nil)
+def dc_img_alt(file_name, text = nil)
   return text if text.present?
 
   name = File.basename(file_name.to_s)
@@ -1203,7 +1230,10 @@ end
 
 private
 
-# will cache dc_user_can_view response
+########################################################################
+# To cache localy dc_user_can_view response for a single call. It has large gains on sites
+# with large menus.
+########################################################################
 def cache_add(id, can_view, msg)
   @can_view_cache[id] = [can_view, msg]
 end

data/app/helpers/dc_image_helper.rb

@@ -71,7 +71,7 @@ end
 ############################################################################
 # Will return code for previewing image on top of dc_image entry form
 ############################################################################
-def dc_image_first(document, *parms)
+def first_dc_image(document, *parms)
   src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{document.first_available_image}"
   %(<span class="dc-image-preview"><img src="#{src}"></img></span><span id="dc-image-preview">).html_safe
 end
@@ -79,7 +79,7 @@ end
 ######################################################################
 # Will format qry result as html code for selecting image
 ######################################################################
-def dc_image_select_links(doc, *parms)
+def select_links_for_dc_image(doc, *parms)
   %w[o s m l].inject('') { | r,size| r << dc_image_link_for_select(doc, size) }.html_safe
 end
 

data/app/models/concerns/dc_user_concern.rb

@@ -149,7 +149,7 @@ end
 # Will return list of available groups
 ##########################################################################
 def self.groups_for_select
-  where(group: true, active: true).order_by(name: 1).inject([]) { |r, e| r << [e.name, e.id] }
+  where(group: true, active: true).order_by(name: 1).map { [_1.name, _1.id] }
 end
 
 private

data/app/models/dc_big_table.rb

@@ -94,7 +94,7 @@ def self.choices4(key, site = nil, locale = nil)
   end
 # Error if empty
   result = [[I18n.t('drgcms.error'),I18n.t('drgcms.error')]] if result.size == 0
-  result
+  result.sort_alphabetical_by(&:first)
 end
  
 end

data/app/models/dc_filter.rb

@@ -114,7 +114,7 @@ def self.get_filter_field(parent)
   return '' if filter.nil?
 
   filter = YAML.load(filter) rescue nil 
-  return '' if filter.nil?
+  return '' if filter.nil? || filter['operation'].to_s == 'eval'
 
   field = get_field_form_definition(filter['field'], parent)
   return '' if field.nil? && filter['input'].nil?
@@ -186,14 +186,10 @@ def self.menu_filter(parent)
     # only single defined. Convert to array.
     filters = [filters] if filters.class == Hash
     filters.each do |filter|
-      url = parent.dc_link_to(filter['title'], nil, controller: 'cmsedit', action: :run, t: table,
-                              f: CmsHelper.form_param(parent.params),
-                              control: 'cmsedit.filter_on',
-                              filter_field: filter['field'],
-                              filter_oper: filter['operation'],
-                              filter_value: filter['value'])
-
-      url = parent.url_for(controller: 'cmsedit', action: :run, t: table, f: CmsHelper.form_param(parent.params),
+      url = parent.url_for(controller: :cmsedit,
+                           action: :run,
+                           table: table,
+                           form_name: CmsHelper.form_param(parent.params),
                            control: 'cmsedit.filter_on',
                            filter_field: filter['field'],
                            filter_oper: filter['operation'],

data/app/models/dc_image.rb

@@ -59,7 +59,7 @@ field :size_s,      type: String
 field :categories,  type: Array, default: []
 field :created_by,  type: BSON::ObjectId
 
-belongs_to :dc_user
+belongs_to :dc_site
 
 index dc_site_id: 1
 index created_by: 1

data/app/models/dc_memory.rb

@@ -63,8 +63,8 @@
 # As result report.pdf file will be opened in new browser window.
 ########################################################################
 class DcMemory
-  include Mongoid::Document
-  
+include Mongoid::Document
+
 ########################################################################
 # Initilize object
 ########################################################################

data/app/models/dc_setup.rb

@@ -0,0 +1,111 @@
+#--
+# Copyright (c) 2024+ 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.
+#++
+
+##############################################################################
+# DcSetup collection is used for settings, that are specific to the application,
+# or part of application (gem). It consists of data dafinitions and form for editing data.
+# Data is saved internaly in YAML format.
+#
+# When editing, admin can see and edit form definition (adding new data to application setup), while user
+# sees only data entry form.
+#
+# Usage:
+#   my_app_settings = DcSetup.find_by(name: 'my_app')
+#   my_app_settings = DcSetup.get('my_app')
+#   company = my_app_settings.company_name
+#   company, ceo = my_app_settings[:company_name, 'ceo_name']
+#
+##############################################################################
+class DcSetup
+include Mongoid::Document
+include Mongoid::Timestamps
+
+attr_reader :my_data
+attr_reader :my_fields
+
+field :name,      type: String, default: ''
+field :data,      type: String, default: ''
+field :form,      type: String, default: ''
+field :editors,   type: Array,  default: []
+
+field :created_by,  type: BSON::ObjectId
+field :updated_by,  type: BSON::ObjectId
+
+index name: 1
+
+validates_length_of :name, minimum: 3
+
+before_save do
+  self.data = my_data.to_yaml
+end
+
+##############################################################################
+# Will return settings record for specified application.
+#
+# @param [String] app_name The name of the application
+# @return [Object, nil] The settings record if found, nil otherwise
+##############################################################################
+def self.get(app_name)
+  DcSetup.find_by(name: app_name.to_s)
+end
+
+##############################################################################
+# Will return value for single setting if called as method.
+##############################################################################
+def method_missing(m, *args, &block)
+  m = m.to_s
+  if m.match('=')
+    m.chomp!('=')
+    my_data[m] = args.first
+  else
+    my_data[m]
+  end
+end
+
+##############################################################################
+# Will return value for single setting. Called as parameter in square brackets.
+# If more then one parameter is passed it will return them as array.
+##############################################################################
+def [](*keys)
+  return my_data[keys.first.to_s] if keys.size == 1
+
+  keys.inject([]) { |r, k| r << my_data[k.to_s] }
+end
+
+##############################################################################
+# Will return true if setting is defined on the form
+##############################################################################
+def respond_to?(field_name)
+  return true #if my_fields[field_name.to_s]
+
+  super.respond_to?(field_name)
+end
+
+##############################################################################
+#
+##############################################################################
+def my_data
+  @my_data ||= (YAML.unsafe_load(data)) || {}
+end
+
+end

data/app/models/drgcms_form_fields/datetime_picker.rb

@@ -81,7 +81,7 @@ end
 ###########################################################################
 def self.get_data(params, name)
   t = params['record'][name] ? params['record'][name].to_datetime : nil
-  t ? Time.zone.local(t.year, t.month, t.day, t.hour, t.min) : nil
+  t ? Time.new(t.year, t.month, t.day, t.hour, t.min) : nil
 end
 
 end

data/app/models/drgcms_form_fields/embedded.rb

@@ -53,19 +53,26 @@ def render
   # HTML defaults. Some must be set    
   @yaml['html'] ||= {}
   @yaml['html']['width'] ||= '99%'
+  # message when new record
+  if @record.new_record?
+    @yaml['html']['srcdoc'] = %(
+<div style='font-family: helvetica; font-size: 1.7rem; font-weight: bold; color: #ddd; padding: 1rem'>
+  #{I18n.t('drgcms.iframe_save_to_view')}
+</div>)
+  end
   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']
+  @yaml['table']     ||= @yaml['form_name']
+  @yaml['form_name'] ||= @yaml['table']
 
-  if @yaml['name'] == @yaml['table'] or @yaml['table'] == 'dc_memory'
+  if @yaml['name'] == @yaml['table'] || @yaml['table'] == 'dc_memory'
     tables = @yaml['table']
     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.map(&:first) + [@yaml['table']]).join(';')
+    ids    = (@parent.ids + [@record.id]).join(';')
   end
   # edit enabled embedded form on a readonly form
   readonly = @yaml['readonly'].class == FalseClass ? nil : @readonly
@@ -73,11 +80,12 @@ def render
            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']         
-         
+  @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)
+  if @record.new_record?
+  else
+    url = @parent.url_for(opts)
     attributes = case
                  when @yaml['load'].nil? || @yaml['load'].match('default')
                    "'src', '#{url}'"

data/app/models/drgcms_form_fields/multitext_autocomplete.rb

@@ -55,16 +55,13 @@ class MultitextAutocomplete < DrgcmsField
 # Returns value for readonly field
 ###########################################################################
 def ro_standard(table, search)
-  return self if @record[@yaml['name']].nil?
+  current_values = @record.send(@yaml['name'])
+  return self if current_values.blank?
 
-  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>'
-  end
-  super(result)
+  search = search.split(/\.|\,/).first if search.match(/\.|\,/)
+  html   = current_values.inject('') { |r, element| r << table.find(element)[search] + '<br>' }
+  super(html)
 end
 
 ###########################################################################
@@ -73,11 +70,11 @@ end
 def render
   # get field name
   if @yaml['search'].class == Hash
-    table    = @yaml['search']['table']
+    table      = @yaml['search']['table']
     field_name = @yaml['search']['field']
-    method   = @yaml['search']['method']
-    search = method.nil? ? field_name : "#{field_name}.#{method}"
-  elsif @yaml['search'].to_s.match(/\./)
+    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(/\.|\,/).map(&:strip)
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   else # search and table name are separated
@@ -101,60 +98,71 @@ def render
     return self
   end
 
-  # TODO check if table exists
-  collection = table.classify.constantize
+  # does collection exists
+  collection = table.classify.constantize rescue nil
+  if collection.nil?
+    @html << "Invalid table name: #{table}"
+    return self
+  end
+
+  # does field exists
   unless @record.respond_to?(@yaml['name'])
     @html << "Invalid field name: #{@yaml['name']}"
     return self
   end
-  # put field to enter search data on form
+
+  # search data entry
   @yaml['html'] ||= {}
   @yaml['html']['value'] = ''   # must be. Otherwise it will look into record and return error
   @yaml['html']['placeholder'] = t('drgcms.search_placeholder')
   _name = '_' + @yaml['name']
   @html << '<div class="ui-autocomplete-border">'
-  @html << @parent.link_to(@parent.fa_icon('plus-square-o', class: 'dc-green'), '#',onclick: 'return false;') # dummy add. But it is usefull.
+  @html << @parent.link_to(@parent.mi_icon('plus-square-o green'), '#', onclick: 'return false;') # dummy add. But it is usefull.
 
+  # text_field for autocomplete
   record = record_text_for(@yaml['name'])
-  # 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
+
+  # link for adding new documents to searched collection
   if @yaml['with_new'] && !@readonly
     @html << ' ' +
-             @parent.fa_icon('plus-square-o', class: 'in-edit-add', title: t('drgcms.new'),
+             @parent.mi_icon('plus-square-o', 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
-  unless @record[@yaml['name']].nil?
-    @record[@yaml['name']].each do |element|
+  # fill with current values
+  current_values = @record.send(@yaml['name'])
+  unless current_values.nil?
+    current_values.each do |element|
   # 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.
+              collection.find(@yaml['name'], @parent.session)
+            else
+              collection.find(element)
+            end
+
       @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;))
-        link  = @parent.fa_icon('check', class: 'dc-green') if @readonly
+        link  = @parent.link_to(@parent.mi_icon('remove_circle red'), '#',
+                onclick: %($('##{rec.id}').hide(); let v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val("-" + v.val());return false;))
+        link  = @parent.mi_icon('check 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>)
       else
-        '** error **'
+        '** error **'  # Related data is missing. It happends.
       end
     end
   end
   @html << "</div></div>"
+
   # 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;")
+  link    = @parent.link_to(@parent.mi_icon('remove_circle red'), '#',
+            onclick: %($('#rec_id').hide(); let 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>"
+  one_div = %(<div id="rec_id" style="padding:4px;">#{link} rec_search<br>#{field}</div>)
 
   # JS stuff
   @js << <<EOJS
@@ -174,7 +182,7 @@ $(document).ready(function() {
       });
     },
     change: function (event, ui) { 
-      var div = '#{one_div}';
+      let div = '#{one_div}';
       if (ui.item != null) { 
         div = div.replace(/rec_id/g, ui.item.id)
         div = div.replace('rec_search', ui.item.value)
@@ -197,7 +205,7 @@ end
 ###########################################################################
 def self.get_data(params, name)
   r = []
-  params['record'].each do |k, v|
+  params['record'].each do |k, v| # inject does not work on params
     # if it starts with - then it was removed
     r << BSON::ObjectId.from_string(v) if k.starts_with?("#{name}_") && v[0] != '-'
   end

data/app/models/drgcms_form_fields/select.rb

@@ -47,7 +47,9 @@ module DrgcmsFormFields
 # * +depend:+ Select options may depend on a value in some other field. If depend option is specified
 #   then chices must be provided by class method and defined in eval option.
 # * +html:+ html options which apply to select field (optional)
-#      
+# * +with_new:+ model_name.form_name will invoke view dialog for selected option
+# * +with_edit:+ model_name.form_name will invoke edit dialog for selected option
+#
 # Form example:
 #    30:
 #      name: type
@@ -150,9 +152,21 @@ end
 def add_view_code
   return '' if (data = @record.send(@yaml['name'])).blank?
 
-  table, form_name = @yaml['view'].split(/\ |\,/).delete_if { |e| e.blank? }
+  table, form_name = @yaml['with_view'].split(/\ |\,/).delete_if(&:blank)
   url  = @parent.url_for(controller: 'cmsedit', id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
-  icon = @parent.mi_icon('eye-o md-18')
+  icon = @parent.mi_icon('visibility-o md-18')
+  %(<span class="dc-window-open" data-url="#{url}"> #{icon}</span>)
+end
+
+###########################################################################
+# Will add code to view more data about selected option in a window
+###########################################################################
+def add_edit_code
+  return '' if (data = @record.send(@yaml['name'])).blank?
+
+  table, form_name = @yaml['view'].split(/\ |\,/).delete_if(&:blank)
+  url  = @parent.url_for(controller: 'cmsedit', id: data, action: :edit, table: table, form_name: form_name, window_close: 1 )
+  icon = @parent.mi_icon('edit-o md-18')
   %(<span class="dc-window-open" data-url="#{url}"> #{icon}</span>)
 end
 
@@ -182,7 +196,7 @@ def ro_standard
         (html = choice; break) if choice.to_s == value.to_s
       end 
     end
-    html << add_view_code if @yaml['view']
+    html << add_view_code if @yaml['with_view']
   end
   super(html)
 end
@@ -202,12 +216,14 @@ def render
 
   record = record_text_for(@yaml['name'])
   if @yaml['html'][:multiple]
+    @yaml['html']['class'] = "#{@yaml['html']['class']} select-multiple"
     @html << @parent.select(record, @yaml['name'], get_choices, options_part, @yaml['html'])
     @js   << "$('##{record}_#{@yaml['name']}').selectMultiple();"
   else
     @html << @parent.select(record, @yaml['name'], get_choices, options_part, @yaml['html'])
     # add code for view more data
-    @html << add_view_code() if @yaml['view']
+    @html << view_code_add() if @yaml['with_view']
+    @html << edit_code_add() if @yaml['with_edit'] && !@readonly
   end
   self
 end