drg_cms 0.6.0.1 → 0.6.1.1.1

data/app/models/drgcms_form_fields/text_area.rb

@@ -52,7 +52,7 @@ end
 # Render text_area field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly
+  #return ro_standard if @readonly
   set_initial_value
 #
 #  @yaml['html'] ||= {}

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -29,6 +29,8 @@ module DrgcmsFormFields
 # * +name:+ field name (required)
 # * +type:+ text_autocomplete (required)
 # * +table+ Collection (table) name. When defined search must contain field name
+# * +with_new+ Will add an icon for shortcut to add new document to collection
+# * +is_id+ Field value represent value as id. If false, field will use entered value and not value selected with autocomplete. Default is true.
 # * +search:+ Search may consist of three parameters from which are separated either by dot (.) 
 #   * 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.
@@ -40,6 +42,7 @@ module DrgcmsFormFields
 #      name: user_id
 #      type: text_autocomplete
 #      search: dc_user.name
+#      is_id: false
 #      html:
 #        size: 30
 ###########################################################################
@@ -49,62 +52,69 @@ class TextAutocomplete < DrgcmsField
 # Render text_autocomplete field html code
 ###########################################################################
 def render
-# Return descriptive text and put it into input field
-# search field name
+  # Return descriptive text and put it into input field
+  # search field name
   if @yaml['search'].class == Hash
     table    = @yaml['search']['table']
     ret_name = @yaml['search']['field']
     method   = @yaml['search']['method']
   elsif @yaml['search'].match(/\./)
-    table, ret_name, method = @yaml['search'].split('.') 
+    table, ret_name, method = @yaml['search'].split(/\.|\,/).map(&:strip)
   else
     ret_name = @yaml['search']
   end
-# determine table name 
+  # determine 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
-      Rails.logger.error "Field #{@yaml['name']}: Invalid table parameter!"
+      Rails.logger.error "Field #{ @yaml['name'] }: Invalid table parameter!"
       nil
     end
   end
-  return 'Table or field keyword not defined!' unless (table and ret_name)
-# TODO check if table exists 
+  return ro_standard 'Table or field keyword not defined!' unless (table && ret_name)
+  # TODO check if table exists
   t = table.classify.constantize
-# find record and return value of field
+  # find record and return value of field
   value_send_as = 'p_' + @yaml['name']
   value = if @parent.params[value_send_as]
     @parent.params[value_send_as]
   elsif @record and @record[@yaml['name']]
     @record[@yaml['name']]
   end
-# Found value to be written in field. If field is not found write out value.
+  # Found value to be written in field. If field is not found write out value.
   if value
-    record = t.find(value)
+    record = t.find(value) unless @yaml['not_id'] # don't if it's is not an id
     value_displayed = record ? record.send(ret_name) : value
   end
-# return if readonly
+  # return if readonly
   return ro_standard(value_displayed) if @readonly
-# Add method back, so autocomplete will know that it must search for method inside class
+  # Add method back, so autocomplete will know that it must search for method inside class
   ret_name = "#{ret_name}.#{method}" if method
   @yaml['html'] ||= {}
   @yaml['html']['value'] = value_displayed
   @yaml['html']['placeholder'] ||= t('drgcms.search_placeholder') || nil
-#    
+  #
   _name = '_' + @yaml['name']
   record = record_text_for(@yaml['name'])  
-  @html << @parent.text_field(record, _name, @yaml['html'])
+  @html << '<span class="dc-text-autocomplete">' + @parent.text_field(record, _name, @yaml['html']) + '<span></span>'
   if @yaml['with_new']
     @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
-  @html << @parent.hidden_field(record, @yaml['name'], value: value)        # actual value will be in hidden field
-# JS stuff    
+  @html << '</span>' + @parent.hidden_field(record, @yaml['name'], value: value)        # actual value will be in hidden field
+  # JS stuff
+  # allow unselected values on is_id: false option
+  not_id = @parent.dc_dont?(@yaml['is_id'], false)
+  not_id_code = %(
+if (ui.item == null) {  
+$("##{record}_#{@yaml['name']}").val($("##{record}__#{@yaml['name']}").val() );
+return;
+} ) if not_id
+  #
   @js << <<EOJS
 $(document).ready(function() {
   $("##{record}_#{_name}").autocomplete( {
@@ -121,9 +131,13 @@ $(document).ready(function() {
         }
       });
     },
+
     change: function (event, ui) { 
+      #{not_id_code}
+      if (ui.item == null) return;
       $("##{record}_#{@yaml['name']}").val(ui.item.id);
     },
+
     minLength: 2
   });
 });

data/app/models/drgcms_form_fields/text_field.rb

@@ -44,7 +44,7 @@ class TextField < DrgcmsField
 # Render text_field field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly
+  #return ro_standard if @readonly
   set_initial_value
 #
   record = record_text_for(@yaml['name'])

data/app/models/drgcms_form_fields/text_with_select.rb

@@ -65,14 +65,17 @@ class TextWithSelect < Select
 # Render text_with_select field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly  
+  #return ro_standard if @readonly  
   set_initial_value('html','value')
   
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field( record, @yaml['name'], @yaml['html']) 
-  @yaml['html']['class'] = 'text-with-select'
+  @yaml['html']['class'] ||= ''
+  @yaml['html']['class'] <<  ' text-with-select'
   @yaml['html'].symbolize_keys!
-  @html << @parent.select( @yaml['name'] + '_', nil, get_choices, { include_blank: true }, { class: 'text-with-select' })
+  unless @readonly
+    @html << @parent.select( @yaml['name'] + '_', nil, get_choices, { include_blank: true }, { class: 'text-with-select' })
+  end
 
   # javascript to update text field if new value is selected in select field
   @js =<<EOJS

data/app/models/drgcms_form_fields/tree_select.rb

@@ -87,15 +87,19 @@ end
 # Render tree_select field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly  
+  #return ro_standard if @readonly  
   set_initial_value('html','value')
   require 'sort_alphabetical'  
   
   record = record_text_for(@yaml['name'])
-  @html << "<div id=\"#{@yaml['name']}\" class=\"tree-select\" #{set_style()} >"
+  clas   = 'tree-select' + (@readonly ? ' dc-readonly' : '')
+  @html << "<div id=\"#{@yaml['name']}\" class=\"#{clas}\" #{set_style()} >"
 # Fill @choices hash. The key is parent object id
   @choices = {}
-  do_eval(@yaml['eval']).each {|data| @choices[ data[2].to_s ] ||= []; @choices[ data[2].to_s ] << (data << false)}
+  choices_in_eval(@yaml['eval']).each do |data| 
+    @choices[ data[2].to_s ] ||= [] 
+    @choices[ data[2].to_s ] << (data << false)
+  end
 # put current values hash with. To speed up selection when there is a lot of categories
   current_values = {}
   current = @record[@yaml['name']] || []
@@ -115,13 +119,20 @@ def render
 # save multiple indicator for data processing on return
   @html << @parent.hidden_field(record, "#{@yaml['name']}_multiple", value: 1) if @yaml['multiple']
 # javascript to update hidden record field when tree looses focus
+readonly_code = %Q[
+,
+"conditionalselect" : function (node) {
+return false; }
+]
+
   @js =<<EOJS
 $(function(){
   $("##{@yaml['name']}").jstree( {
     "checkbox" : {"three_state" : false},        
     "core" : { "themes" : { "icons": false },
                "multiple" : #{@yaml['multiple'] ? 'true' : 'false'}  },
-    "plugins" : ["checkbox"]
+    "plugins" : ["checkbox","conditionalselect"]
+    #{@readonly ? readonly_code : ''}
   });
 });
   

data/app/{helpers → renderers}/dc_big_menu_renderer.rb

@@ -32,6 +32,7 @@
 class DcBigMenuRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 ########################################################################
 # Object initialization.
 ########################################################################

data/app/{helpers → renderers}/dc_gallery_renderer.rb

@@ -33,6 +33,7 @@
 class DcGalleryRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Object initialization.

data/app/{helpers → renderers}/dc_menu_renderer.rb

@@ -35,6 +35,7 @@
 class DcMenuRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 ########################################################################
 # Object initialization. Will also prepare DcMenu document.
 ########################################################################
@@ -97,10 +98,16 @@ def link_4menu(item)
   caption   = item.caption[0] == '-' ? '' : item.caption.to_s
   img_title = item.caption.to_s.sub('-','')
 # add picture if picture is not blank
-  (item.picture.blank? ? '' : 
-    @parent.link_to( @parent.image_tag(item.picture), link, {title: img_title, target: target} )) +
-  (caption.blank? ? '' : 
-    @parent.link_to(caption, link, {target: target}) )
+  html = ''
+  if !item.picture.blank?
+    if item.picture[0,3] == 'fa-' 
+      caption << @parent.fa_icon(item.picture[3,20])
+    else
+      html = @parent.link_to( @parent.image_tag(item.picture), link, {title: img_title, target: target} ) rescue ''
+    end
+  end
+  html << @parent.link_to(caption.html_safe, link, {target: target}) unless caption.blank?
+  html
 end
 
 ########################################################################

data/app/{helpers → renderers}/dc_page_renderer.rb

@@ -36,6 +36,7 @@
 class DcPageRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Object initialization.

data/app/{helpers → renderers}/dc_part_renderer.rb

@@ -42,6 +42,7 @@
 class DcPartRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Object initialization.
@@ -98,7 +99,7 @@ def load_parts #:nodoc:
 # add parts in page
   @parent.page.dc_parts.where(active: true).each do |part|
     type = decamelize_type(part._type) || 'dc_part'
-    @parent.parts << [part, @parent.page.id, type, "#{@parent.site.page_table};#{type}"]
+    @parent.parts << [part, @parent.page.id, type, "#{@parent.site.page_class.underscore};#{type}"]
   end
 # add parts in site
   @parent.site.dc_parts.where(active: true).each do |part|
@@ -161,11 +162,11 @@ end
 def in_page
 # Part is in page with id  
   page = if @opts[:page_id]
-    pageclass = @parent.site.page_table.classify.constantize
+    pageclass = @parent.site.page_klass
     pageclass.find(@opts[:page_id])
 # Part is in page with subject link
   elsif @opts[:page_link]
-    pageclass = @parent.site.page_table.classify.constantize
+    pageclass = @parent.site.page_klass
     @page = pageclass.find_by(dc_site_id: @parent.site._id, subject_link: @opts[:page_link])
 # Part is in current page
   else
@@ -174,7 +175,7 @@ def in_page
   return "Error DcPart: Page not found!" if page.nil?
 #  
   if part = page.dc_parts.find_by(name: @opts[:name])
-    @opts[:editparams].merge!(id: part, ids: page._id, form_name: 'dc_part', table: "#{@parent.site.page_table};dc_part" )
+    @opts[:editparams].merge!(id: part, ids: page._id, form_name: 'dc_part', table: "#{@parent.site.page_class.underscore};dc_part" )
     render_particle(part, @opts) 
   else
     "Part with name #{@opts[:name]} not found in page!"

data/app/{helpers → renderers}/dc_piece_renderer.rb

@@ -33,7 +33,7 @@
 class DcPieceRenderer
 
 include DcApplicationHelper
-
+include CmsCommonHelper
 ########################################################################
 # Object initialization. It also loads requested dc_piece document.
 ########################################################################

data/app/{helpers → renderers}/dc_poll_renderer.rb

@@ -27,9 +27,9 @@
 ########################################################################
 class DcPollRenderer
   
-include CmseditHelper
+include CmsCommonHelper
 include DcApplicationHelper
-include ActionView::Helpers::FormHelper # for form hepers
+include ActionView::Helpers::FormHelper # for form helpers
 include ActionView::Helpers::FormOptionsHelper # for select helper
 
 ########################################################################
@@ -39,6 +39,7 @@ def initialize( parent, opts={} ) #:nodoc:
   @parent   = parent
   @opts     = opts
   @part_css = ''
+  @part_js  = ''
   self
 end
 
@@ -56,15 +57,17 @@ def do_one_item(poll, yaml)
   html = ''
   yaml['separator'] ||= ''
   yaml['text']      ||= ''
-# 
+  # label
   text = yaml['text'].match(/\./) ? t(yaml['text']) : yaml['text'] 
   if yaml['mandatory']
-    text << '<font color="red"> *</font>' 
+    text << ( poll.display == 'in' ? ' *' : '<span class="required"> *</span>' )
     yaml['html'] ||= {}
     yaml['html']['required'] = true
+  else
+    text << " &nbsp;" if poll.display == 'lr' and !yaml['type'].match(/submit_tag|link_to/)
   end
   
-# Just add text if comment and go to next one    
+  # Just add text if comment and go to next one
   if yaml['type'] == 'comment'
     html << if poll.display == 'lr'
       "<div class='row-div'><div class='dc-form-label poll-data-text comment'>#{text}</div></div>"
@@ -73,35 +76,39 @@ def do_one_item(poll, yaml)
     end    
     return html
   end
-# Set default value, if not already set
+
+  # Set default value, if not already set
   if yaml['default'] 
     if yaml['default'].match('eval')
       e = yaml['default'].match(/\((.*?)\)/)[1]
       yaml['default'] = eval e
+    elsif yaml['default'].match('params')
+      param_name = yaml['default'].split(/\.|\ |\,/)[1]
+      yaml['default'] = @parent.params[param_name]
     end
     key = "p_#{yaml['name']}"
     params[key] = yaml['default'] unless params[key]
   end
-# create form_field object and retrieve html code
+  # Label as placeholder
+  if poll.display == 'in'
+    yaml['html'] ||= {}
+    yaml['html']['placeholder'] = text
+  end
+  # create form_field object and retrieve html code
   clas_string = yaml['type'].camelize
   field_html = if DrgcmsFormFields.const_defined?(clas_string) 
     clas = DrgcmsFormFields.const_get(clas_string)
-    o = clas.new(@parent, @record, yaml).render
-#TODO collect all javascript and add it at the end
-    o.html + (o.js.size > 0 ? @parent.javascript_tag(o.js) : '')
-  else # litle error string
+    field = clas.new(@parent, @record, yaml).render
+    @part_js << field.js
+    field.html
+  else # error string
     "Error: Code for field type #{yaml['type']} not defined!"
   end
 
-#  field = send('dc_' + yaml['type'], yaml) # call dc_xxx method to get field html code
   if yaml['type'].match(/submit_tag|link_to/)
-# There can be more than one links on form. End the data at first link or submit.
+    # There can be more than one links on form. End the data at first link or submit.
     if !@end_of_data 
-      html << if poll.display == 'lr'
-        "</div><br>\n"
-      else
-        "</div>\n"
-      end
+      html << (poll.display == 'lr' ? "</div><br>\n" : "</div>\n")
       # captcha
       if poll.captcha_type.to_s.size > 1
         @opts.merge!(:captcha_type => poll.captcha_type)
@@ -109,90 +116,109 @@ def do_one_item(poll, yaml)
         html << captcha.render_html
         @part_css = captcha.render_css
       end
-      @end_od_data = true
+      @end_of_data = true
     end
-# submit and link tag 
+    # submit and link tag
     clas = yaml['type'].match(/submit_tag/) ? '' : 'dc-link-submit'
     html << "<span class='#{clas} dc-animate'>#{field_html}#{yaml['separator']}</span>"
-# other elements
+  # other fields
   else
-    html << if poll.display == 'lr'
-      "<div class='row-div'><div class='dc-form-label poll-data-text #{yaml['class']}'>#{text}</div><div class='dc-form-field poll-data-field #{yaml['class']}'>#{field_html}</div></div>\n"
-    else
-      "<div class='poll-data-text #{yaml['class']}'>#{text}</div><div class='poll-data-field #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+    html << case
+      when poll.display == 'lr' then
+      "<div class='row-div'><div class='dc-form-label poll-data-text lr #{yaml['class']}'>#{text}</div><div class='poll-data-field td #{yaml['class']}'>#{field_html}</div></div>\n"
+      when poll.display == 'td' then
+      "<div class='poll-data-text td #{yaml['class']}'>#{text}</div><div class='poll-data-field td #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+      else
+      "<div class='poll-data-field in #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
     end    
   end
 end
 
+########################################################################
+# Call method before poll is displayed. Usefull for filling predefined values into flash[:record][value]
+# Method cane be defined as ClassName.method or only method. 
+# If only method is defined then method name must exist in helpers.
+# 
+# Called method must return at least one result if process can continue.
+########################################################################
+def eval_pre_display(code)
+  a = code.strip.split('.')
+  if a.size == 1
+    continue, message = @parent.send(a.first)
+  else
+    klass = a.first.classify.constantize
+    continue, message = klass.send(a.last,@parent)
+  end
+  [continue, message]
+end
+
 ########################################################################
 # Default poll renderer method. Renders data for specified pool.
 ########################################################################
 def default
-# poll_id may be defined in params or opts
+  # poll_id may be defined in params or opts
   poll_id = @opts[:poll_id] || @parent.params[:poll_id]
   return '<br>Poll id is not defined?<br>' if poll_id.nil?
-#  
+
   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?
-# If parent cant be seen. so cant be polls
+  return %(<div class="dc-form-error">Invalid Poll id #{poll_id}</div>) if poll.nil?
+  # If parent cant be seen. so cant be polls
   can_view, message = dc_user_can_view(@parent, @parent.page)
-  return "<div class=\"dc-form-error\">#{message}</div>" unless can_view
-  
-  html = @opts[:div] ? "<div id='#{@opts[:div]}'>" : ''
-  html << '<a name="poll-top"></a>'
+  return %(<div class="dc-form-error">#{message}</div>) unless can_view
 
-  # 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.
-  if poll.pre_display.to_s.size > 1
+  html = @opts[:div] ? %(<div id="#{@opts[:div]}"'>) : ''
+  html << '<a name="poll-top"></a>'
+  unless poll.pre_display.blank?
     begin
-      continue, message = eval(poll.pre_display.strip + '(@parent)')
+      continue, message = eval_pre_display(poll.pre_display)
     rescue Exception => e
-      return "<div class=\"dc-form-error\">Error! Poll pre display. Error: #{e.message}</div>" 
+      return %(<div class="dc-form-error">Error! Poll pre display. Error: #{e.message}</div>)
     end
     return message unless continue
+
     html << message if message
   end
-# there might be more than one poll displayed on page. Check if messages and values are for me
-  if @parent.flash[:poll_id].nil? or @parent.flash[:poll_id].to_s == poll_id.to_s
-# If flash[:record] is present copy content to params record hash
+  # there might be more than one poll displayed on page. Check if messages and values are for me
+  if @parent.flash[:poll_id].nil? || @parent.flash[:poll_id].to_s == poll_id.to_s
+    # If flash[:record] is present copy content to params record hash
     @parent.flash[:record].each {|k,v| @parent.params["p_#{k}"] = v } if @parent.flash[:record]  
-# Error during procesing request
-    html << "<div class=\"dc-form-error\">#{@parent.flash[:error]}</div>\n" if @parent.flash[:error].to_s.size > 0
-    html << "<div class=\"dc-form-info\">#{@parent.flash[:info]}</div>\n" if @parent.flash[:info]
+    # Error during procesing request
+    html << %(<div class="dc-form-error">#{@parent.flash[:error]}</div>\n) if @parent.flash[:error].to_s.size > 0
+    html << %(<div class="dc-form-info">#{@parent.flash[:info]}</div>\n) if @parent.flash[:info]
   end
-# div and form tag
-  html <<  "<div class=\"poll-div\">\n"
-# edit link  
+  # div and form tag
+  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', form_name: '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] )
   end
-#  
+
   html << case
   when poll.operation == 'poll_submit' then
     @parent.form_tag(action: poll.operation, method: :put)
   when poll.operation == 'link' then
     @parent.form_tag( poll.parameters, method: :put)
   end
-# header 
-  html << "<div class='poll-title'>#{poll.title}</div>" unless poll.title[0] == '-' # - on first position will not display title
-  html << poll.sub_text.to_s # if poll.sub_text.to_s.size > 5
+  # header, - on first position will not display title
+  html << %(<div class="poll-title">#{poll.title}</div>) unless poll.title[0] == '-'
+  html << %(<div class="poll-text">#{poll.sub_text}</div>)
   html << if poll.display == 'lr'
-    "\n" + '<div class="poll-data-table">'
-  else
-    '<div class="poll-data-div">' + "\n"
-  end
-# items. Convert each item to yaml
+            %(\n<div class="poll-data-table">)
+          else
+            %(<div class="poll-data-div">\n)
+          end
+  # items. Convert each item to yaml
   @end_od_data = false
   if poll.form.to_s.size < 10
     items = poll.dc_poll_items
-    items.sort! {|a,b| a.order <=> b.order }
+    items.sort! { |a,b| a.order <=> b.order }
     items.each do |item|
       next unless item.active # disabled items
-  # convert options to yaml
+      # convert options to yaml
       yaml = YAML.load(item.options) || {}
       yaml = {} if yaml.class == String
       yaml['name'] = item.name
@@ -200,22 +226,23 @@ def default
       yaml['html']['size'] = item.size
       (yaml['html']['class'] ||= 'dc-submit') if item.type == 'submit_tag'
       yaml['text'] = item.text
-      yaml['mandatory']  = item.mandatory
-      yaml['type']       = item.type
+      yaml['mandatory'] = item.mandatory
+      yaml['type'] = item.type
+
       html << do_one_item(poll, yaml)
     end
-# Form. Just call do_one_item for each form item
   else
     yaml = YAML.load(poll.form.gsub('&nbsp;',' ')) # very annoying. They come with copy&paste ;-)
-# if entered without numbering yaml is returned as Hash otherwise as Array
+    # if entered without numbering yaml is returned as Hash otherwise as Array
     yaml.each { |i| html << do_one_item(poll, (i.class == Hash ? i : i.last)) } # 
   end
-# hide some fields usefull as parameters  
-# was html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to] || '/')
+  # hide some fields usefull as parameters
   html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to] || @parent.request.url)
   html << @parent.hidden_field_tag('return_to_error', @parent.request.url )
   html << @parent.hidden_field_tag('poll_id', poll_id )
   html << @parent.hidden_field_tag('page_id', @parent.page.id )
+  # Add javascript code
+  html << @parent.javascript_tag(@part_js + poll.js.to_s)
   html << "</form></div>"
   html << '</div>' if @opts[:div]