drg_cms 0.5.10.10 → 0.5.50.2

data/app/assets/stylesheets/drg_cms_cms.css

@@ -11,13 +11,11 @@
  *= require drg_cms/drg_cms
  *= require drg_cms/jquery.datetimepicker.css
  *= require drg_cms/select-multiple
- *= #require jquery-ui/all  
- *= require jquery-ui/tooltip
- *= require jquery-ui/autocomplete
- *= #require ../javascripts/drg_cms/elfinder/css/elfinder.min.css
- *= #require ../javascripts/drg_cms/elfinder/css/theme.css
+
+ *= require jquery-ui/all
+ 
  *= require font-awesome
 */
 
 /* Required for link buttons to look alike */
-.dc-link a, .dc-link-submit input {font-weight: bold; font-family: helvetica; font-size: 12px; }   
+.dc-link a, .dc-link-submit input {font-weight: bold; font-size: 12px; }   

data/app/controllers/{drgcms_controls/browse_models_control.rb → browse_models_control.rb}

@@ -25,7 +25,7 @@
 ######################################################################
 # 
 ######################################################################
-module DrgcmsControls::BrowseModelsControl
+module BrowseModelsControl
 include DcApplicationHelper
 
 #########################################################################

data/app/controllers/cmsedit_controller.rb

@@ -77,7 +77,7 @@
 ########################################################################
 class CmseditController < DcApplicationController
 before_action :check_authorization, :except => [:login, :logout]
-before_filter :dc_reload_patches if Rails.env.development?
+before_action :dc_reload_patches if Rails.env.development?
   
 layout 'cms'
 
@@ -623,6 +623,11 @@ def check_authorization
 # Extend class with methods defined in drgcms_controls module. May include embedded forms therefor ; => _ 
     controls_string = (@form['controls'] ? @form['controls'] : params[:table].gsub(';','_')) + '_control'
     controls = "DrgcmsControls::#{controls_string.classify}".constantize rescue nil
+# version next
+    if controls.nil?
+      controls_string = "#{@form['controls'] || params[:table].gsub(';','_')}_control"
+      controls = "#{controls_string.classify}".constantize rescue nil
+    end
     extend controls if controls 
   else
     render(action: 'error', locals: { error: t('drgcms.not_authorized')} )

data/app/controllers/dc_application_controller.rb

@@ -29,7 +29,7 @@
 class DcApplicationController < ActionController::Base
   protect_from_forgery
   
-  before_filter :dc_reload_patches if Rails.env.development?
+  before_action :dc_reload_patches if Rails.env.development?
   
 ########################################################################
 # Writes anything passed as parameter to logger file. 
@@ -207,7 +207,8 @@ end
 # Detects if called from mobile agent according to http://detectmobilebrowsers.com/
 ####################################################################
 def dc_set_is_mobile
-  is_mobile = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.match(request.user_agent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.match(request.user_agent[0..3])
+  is_mobile = request.user_agent ? /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.match(request.user_agent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.match(request.user_agent[0..3])
+                                 : false
   session[:is_mobile] = is_mobile ? 1 : 0
 end
 
@@ -273,6 +274,12 @@ def get_design_and_render(design_doc)
   layout      = @site.site_layout.blank? ? 'content' : @site.site_layout
   site_top    = '<%= dc_page_top %>'
   site_bottom = '<%= dc_page_bottom %>'
+# lets try the rails way
+ if @options[:control] and @options[:action]
+    controller = "#{@options[:control]}_control".classify.constantize rescue nil
+    extend controller if controller
+    return send @options[:action] if respond_to?(@options[:action])
+  end
 #  
   if design_doc
     if !design_doc.rails_view.blank? 

data/app/controllers/{drgcms_controls/dc_page_control.rb → dc_page_control.rb}

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcPage model.
 ######################################################################
-module DrgcmsControls::DcPageControl
+module DcPageControl
 
 ######################################################################
 # Called when new empty record is created

data/app/forms/all_options.yml

@@ -40,7 +40,7 @@ index:
       caption: Some caption
 
 result_set:
-  filter: filter_vpis
+  filter: custom_filter
   actions_width: 100
   per_page: 10
   table_style: 'color: green;'
@@ -65,6 +65,7 @@ result_set:
       icon: delete.png
     4:
       type: link
+      caption: Caption
       controller: controller_name
       action: action_name
       table: table_name
@@ -127,6 +128,8 @@ form:
         type: text_field
         type: hidden_field
         type: readonly
+        type: file_select
+        
         colspan: 2
         size: 50 or
         html:

data/app/forms/dc_category.yml

@@ -42,6 +42,7 @@ form:
     30:
       name: ctype
       type: select
+      eval: "DcCategory.choices4_ctype(@parent.dc_get_site)"
 
     40:
       name: order

data/app/forms/dc_design.yml

@@ -41,18 +41,30 @@ form:
         html:
           include_blank: true
       30:
-        name: rails_view
+        name: control
         type: text_field
         html:
           size: 50
           
       40:
+        name: control_method
+        type: text_field
+        html:
+          size: 50
+          
+      50:
+        name: rails_view
+        type: text_field
+        html:
+          size: 50
+          
+      60:
         name: body
         type: text_area
         html:
-          size: 120x30
+          size: 120x25
 
-      50:
+      70:
         name: css
         type: text_area
         html:

data/app/forms/dc_journal.yml

@@ -3,7 +3,7 @@
 table: dc_journal
 
 index:
-  filter: tables, user_id, site_id
+  filter: tables, user_id, site_id, doc_id
   actions:
     1: filter
 

data/app/helpers/cmsedit_helper.rb

@@ -630,7 +630,7 @@ def top_bottom_line(yaml, columns=2)
     style = yaml['style'] 
   end
   clas ||= 'dc-separator'
-  "<tr><td colspan=\"#{columns*2}\" class=\"#{clas}\" style=\"#{style}\"></td></tr>"
+  "<tr><td>&nbsp;</td></tr><tr><td colspan=\"#{columns*2}\" class=\"#{clas}\" style=\"#{style}\"></td></tr><tr><td>&nbsp;</td></tr>"
 end    
 
 ############################################################################
@@ -788,7 +788,7 @@ def dc_document_statistics
   parms = params.clone
   parms[:controller] = 'dc_common'
   parms[:action]     = 'copy_clipboard'
-  url = url_for(parms)
+  url = url_for(parms.permit!)
 #  caption = image_tag('drg_cms/copy.png', title: t('drgcms.doc_copy_clipboard'))
 #  html << %Q[<hr><img class="dc-link-img dc-link-ajax dc-animate" data-url="#{url}" data-request="get" #{caption}]
   html << fa_icon('copy 2x', class: 'dc-link-img dc-link-ajax dc-animate', 

data/app/helpers/dc_application_helper.rb

@@ -74,6 +74,10 @@ end
 # Parameters:
 # [renderer] String or Symbol. Class name (in lowercase) that will be used to render final HTML code. 
 # If class name is provided without '_renderer' suffix it will be added automatically.
+# 
+# When renderer has value :part, it is a shortcut for dc_render_design_part method which
+# is used to draw parts of layout on design.
+# 
 # [opts] Hash. Additional options that are passed to method. Options are merged with
 # options set on site, design, page and passed to renderer object.
 # 
@@ -81,6 +85,8 @@ end
 #    <%= dc_render(:dc_page, method: 'view', category: 'news') %>
 ############################################################################
 def dc_render(renderer, opts={})
+  return dc_render_design_part(renderer[:part]) if renderer.class == Hash
+# 
   opts[:edit_mode]  = session[:edit_mode] 
   opts[:editparams] = {}
   opts = @options.merge(opts) # merge options with parameters passed on site, page, design ...
@@ -239,9 +245,11 @@ def dc_edit_title()
     c << (@form['title'] ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
     title = (title and title['field']) ? title['field'] : @form['form']['edit_title']
     dc_deprecate('form:edit_title will be deprecated. Use form:title:field instead.') if @form['form']['edit_title']
+#
     c << "#{@record[ title ]} : " if title and @record.respond_to?(title)
-    c << @record._id #if @record._id 
+    c << @record._id if @record
   end
+  c
 end
 
 ############################################################################
@@ -433,7 +441,9 @@ def dc_link_for_create(opts)
   title = opts.delete('title') #
   title = t(title, title) if title
   target = opts.delete('target')  || 'iframe_cms'
-  opts['action'] = 'new'
+  opts['form_name']  ||= opts['table']
+  opts['action']       = 'new'
+  opts['controller'] ||= 'cmsedit'
   js = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
   dc_link_to(nil, _origin.fa_icon('plus-circle lg', class: 'dc-inline-link'), '#',
              { onclick: js, title: title, alt: 'Create'}).html_safe
@@ -456,8 +466,9 @@ def dc_link_for_edit(opts)
   opts.stringify_keys!  
   title  = opts.delete('title') #
   target = opts.delete('target') || 'iframe_cms'
-  opts['action'] = 'edit'
   opts['controller'] ||= 'cmsedit'
+  opts['action']       = 'edit'
+  opts['form_name']  ||= opts['table']
   js  = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
   dc_link_to(nil, _origin.fa_icon('edit lg', class: 'dc-inline-link'), '#', 
              { onclick: js, title: title, alt: 'Edit'})
@@ -509,18 +520,19 @@ end
 def dc_page_edit_menu(opts=@opts)
   return '' if opts[:edit_mode] < 2
 # save some data to cookie. This can not go to session.
+  page  = opts[:page] || @page
   table = _origin.site.page_table
-  kukis = { "#{table}.dc_design_id" => @page.dc_design_id,
-            "#{table}.menu_id"      => @page.menu_id,
-            "#{table}.kats"         => @page.kats,
-            "#{table}.page_id"      => @page.id,
+  kukis = { "#{table}.dc_design_id" => page.dc_design_id,
+            "#{table}.menu_id"      => page.menu_id,
+            "#{table}.kats"         => page.kats,
+            "#{table}.page_id"      => page.id,
             "#{table}.dc_site_id"   => _origin.site.id
   }
   _origin.cookies[:record] = Marshal.dump(kukis)
-  title = "#{t('drgcms.edit')}: #{@page.subject}"
+  title = "#{t('drgcms.edit')}: #{page.subject}"
   dc_link_menu_tag(title) do |html|
     opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', 'icon' => 'edit' )
-    opts[:editparams].merge!( :id => @page.id, :table => _origin.site.page_table, formname: opts[:formname], edit_only: 'body' )
+    opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_table, formname: opts[:formname], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
 #    opts[:editparams][:edit_only] = nil
@@ -531,7 +543,7 @@ def dc_page_edit_menu(opts=@opts)
     opts[:editparams].merge!( action: 'new', 'icon' => 'plus' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_page') )
 
-    opts[:editparams].merge!(ids: @page.id, formname: 'dc_part', 'icon' => 'plus-square-o', 
+    opts[:editparams].merge!(ids: page.id, formname: 'dc_part', 'icon' => 'plus-square-o', 
                              table: "#{_origin.site.page_table};dc_part"  )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_part') )
   end
@@ -687,8 +699,8 @@ end
 def dc_name4_id(model, field, field_name, id=nil)
   return '' if id.nil?
   field_name = 'id' if field_name.nil?
-  model = model.classify.constantize if model.class == String
-  rec = Mongoid::QueryCache.cache { model.find_by(field_name.to_sym => id) }
+  model = model.strip.classify.constantize if model.class == String
+  rec = Mongoid::QueryCache.cache { model.find_by(field_name.strip.to_sym => id) }
   rec.nil? ? '' : rec[field]
 end
 
@@ -842,11 +854,11 @@ def dc_choices4_cmsmenu()
     menus = forms_merge(menu['menu'], menus)        # ignore top level part
  end
 #
-  html = ''
+  html = '<ul>'
   menus.to_a.sort.each do |one_menu|    # sort menus, result is array of sorted hashes
     menu = one_menu[1]                  # value is the second (1) element of array
     next unless menu['caption']
-    html << "<li>#{fa_icon(menu['icon'])}#{t(menu['caption'])}<ul>"
+    html << "<li class=\"cmsedit-top-level-menu\">#{fa_icon(menu['icon'])}#{t(menu['caption'])}<ul>"
     menu['items'].to_a.sort.each do |item|          # as above. sort items first 
       value = item[1]
       opts = { controller: value['controller'], 
@@ -1145,6 +1157,7 @@ def dc_iframe_edit(table, opts={})
     params[:id]         ||= params[:idp] || opts[:id]
     params[:readonly]   ||= opts[:readonly]
     params[:path]       = nil
+    params.permit! # rails 5 request
     "<iframe id='iframe_edit' name='iframe_edit' src='#{url_for params}'></iframe>"
   else
     "<iframe id='iframe_edit' name='iframe_edit'></iframe>"

data/app/helpers/dc_poll_renderer.rb

@@ -58,7 +58,12 @@ def do_one_item(poll, yaml)
   yaml['text']      ||= ''
 # 
   text = yaml['text'].match(/\./) ? t(yaml['text']) : yaml['text'] 
-  text << '<font color="red"> *</font>' if yaml['mandatory']
+  if yaml['mandatory']
+    text << '<font color="red"> *</font>' 
+    yaml['html'] ||= {}
+    yaml['html']['required'] = true
+  end
+  
 # Just add text if comment and go to next one    
   if yaml['type'] == 'comment'
     html << if poll.display == 'lr'
@@ -112,9 +117,9 @@ def do_one_item(poll, yaml)
 # other elements
   else
     html << if poll.display == 'lr'
-      "<tr><td class='poll-data-text'>#{text}</td><td class='poll-data-field'>#{field_html}</td></tr>\n"
+      "<tr><td class='poll-data-text'>#{text}</td><td class='poll-data-field #{yaml['class']}'>#{field_html}</td></tr>\n"
     else
-      "<div class='poll-data-text'>#{text}</div><div class='poll-data-field'>#{field_html}#{yaml['separator']}</div>\n"
+      "<div class='poll-data-text'>#{text}</div><div class='poll-data-field #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
     end    
   end
 end
@@ -130,7 +135,8 @@ def default
   poll = DcPoll.find(poll_id)
   poll = DcPoll.find_by(name: poll_id) if poll.nil? # name instead of id
   return "<div class=\"dc-form-error\">Invalid Poll id #{poll_id}</div>" if poll.nil?
-  html = '<a name="poll-top"></a>'
+  html = @opts[:div] ? "<div id='#{@opts[:div]}'>" : ''
+  html << '<a name="poll-top"></a>'
 
   # Operation called before poll is displayed. Usefull for filling predefined values into flash[:record][value]
   # Called method must return at least one result if process can continue.
@@ -156,7 +162,7 @@ def default
   html <<  "<div class=\"poll-div\">\n"
 # edit link  
   if @opts[:edit_mode] > 1
-    @opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', id: poll._id, table: 'dc_poll' )
+    @opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', id: poll._id, table: 'dc_poll', formname: 'dc_poll' )
     @opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{poll.name}")
     @opts[:editparams].delete(:ids) # this is from page, but it gets in a way
     html << dc_link_for_edit( @opts[:editparams] )
@@ -207,6 +213,7 @@ def default
   html << @parent.hidden_field_tag('poll_id', poll_id )
   html << @parent.hidden_field_tag('page_id', @parent.page.id )
   html << "</form></div>"
+  html << '</div>' if @opts[:div]
   
   @part_css = poll.css
   html

data/app/models/dc_big_table.rb

@@ -79,21 +79,22 @@ class DcBigTable
 # Will return possible choices for specified key prepared for usega in select input field.
 ########################################################################
 def self.choices4(key, site, locale=nil)
-  a = []
-  r = find(key: key, site: site)
-  if r
-    r.dc_big_table_values.each do |v| 
-      desc = v.description
+  result = []
+  choices = find_by(key: key, site: site)
+  choices = find_by(key: key, site: nil) if choices.nil?
+  if choices
+    choices.dc_big_table_values.each do |choice| 
+      description = choice.description
       if locale
-        d = v.find('dc_big_table_values.locale' => locale)
-        desc = d.value if d
+        desc = choice.find_by('dc_big_table_values.locale' => locale)
+        description = desc.value if desc
       end             
-      a << [v.value, desc]
+      result << [description, choice.value]
     end
   end
 # Error if empty
-  a = [[I18n.t('drgcms.error'),I18n.t('drgcms.error')]] if a.size == 0
-  a
+  result = [[I18n.t('drgcms.error'),I18n.t('drgcms.error')]] if result.size == 0
+  result
 end
  
 end

data/app/models/dc_category.rb

@@ -68,4 +68,21 @@ def self.values_for_parent #:nodoc:
   where(parent: nil).sort(name: 1).inject([]) {|r,v| r << [v.name, v._id]} 
 end
 
+#########################################################################
+# Returns values for category type. Values should be defined in BigTable 
+# on the site level all owerall.
+#########################################################################
+def self.choices4_ctype(site_id=nil)
+  site_id = site_id.id if site_id
+  if DcBigTable.find_by(key: 'dc_category_type', :site.in => [site_id, nil])
+    DcBigTable.choices4('dc_category_type', site_id)
+  else
+    opts = I18n.t('helpers.label.dc_category.choices4_ctype')
+# not defined    
+    return [] if opts.blank?
+    opts.split(',').inject([]) {|result, e| result << e.split(':')}    
+  end
+end
+
+
 end

data/app/models/dc_design.rb

@@ -93,6 +93,8 @@ class DcDesign
   field   :body,        type: String,  default: ''
   field   :css,         type: String,  default: ''
   field   :rails_view,  type: String,  default: ''
+  field   :control,     type: String,  default: ''
+  field   :control_method,  type: String,  default: ''
   field   :author,      type: String
   field   :active,      type: Boolean, default: true 
   field   :created_by,  type: BSON::ObjectId

data/app/models/drgcms_form_fields.rb

@@ -355,9 +355,11 @@ def render
   @yaml['name'] = 'old' if @record[@yaml['name']].nil?
   @html << '<table width="99%">'
   JSON.parse(@record[@yaml['name']]).each do |k,v|
+    old_value = v.class == Array ? v[0] : v
+    new_value = v.class == Array ? v[1] : v
     @html << "<tr><td style='background-color: #654ddd;'>#{@parent.check_box('select', k)} #{k}:</td></tr>
-             <tr><td style='background-color: #ffe;'>#{v[0]}</td></tr>
-             <tr><td style='background-color: #eff;'>#{v[1]}</td></tr>"
+             <tr><td style='background-color: #ffe;'>- #{old_value}</td></tr>
+             <tr><td style='background-color: #eff;'>+ #{new_value}</td></tr>"
   end
   @html << '</table>'
   self
@@ -596,7 +598,7 @@ def get_choices
       choices.chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )} :
       choices
   rescue Exception => e 
-    p "Error in select eval. #{e.message}"
+    Rails.logger.debug "Error in select eval. #{e.message}\n"
     ['error'] # return empty array when error occures
   end
 end