drg_cms 0.6.0.6 → 0.6.1.4

data/app/models/drgcms_form_fields/select.rb

@@ -62,6 +62,8 @@ module DrgcmsFormFields
 #      name: company
 #      type: select
 #      choices: Audi,BMW,Mercedes
+#        or
+#      choices: helpers.label.model.choices4_field
 #    60:
 #      name: type
 #      type: select
@@ -75,8 +77,8 @@ class Select < DrgcmsField
 # helper.label.table_name.choices_for_fieldname or
 # choices4_tablename_fieldname
 ###########################################################################
-def choices_in_helper(all)
-  helper = "helpers.label.#{@form['table']}.choices4_#{@yaml['name']}"
+def choices_in_helper(helper = nil)
+  helper ||= "helpers.label.#{@form['table']}.choices4_#{@yaml['name']}"
   c = t(helper)
   if c.match( 'translation missing' )
     helper = "choices_for_#{@form['table']}_#{@yaml['name']}"
@@ -86,32 +88,28 @@ def choices_in_helper(all)
 end
 
 ###########################################################################
-# Choices are defined by evaluating an exspression. This is most common class
-# method defined in a class. SomeClass.get_choices4.
+# Choices are defined by evaluating an expression. This is most common class
+# method defined in a class. eg. SomeClass.get_choices4
 ###########################################################################
-def choices_in_eval(e, all=false)
+def choices_in_eval(e)
   e.strip!
   if @yaml['depend'].nil?
     method = e.split(/\ |\(/).first
     return eval(e) if respond_to?(method) # id method defined here
-    return eval('@parent.'+e) if @parent.respond_to?(method) # is method defined in helpers
+    return eval('@parent.' + e) if @parent.respond_to?(method) # is method defined in helpers
     # eval whatever it is there
     eval e
   else
     # add event listener to depend field
-    @js << %Q[
+    @js << %(
 $(document).ready(function() {
   $('#record_#{@yaml['depend']}').change( function(e) { update_select_depend('record_#{@yaml['name']}', 'record_#{@yaml['depend']}','#{e}');});
   $('#_record_#{@yaml['depend']}').change( function(e) { update_select_depend('record_#{@yaml['name']}', '_record_#{@yaml['depend']}','#{e}');});
 });
-]
-    # depend field might be virtual field. Its value should be set in params
-    depend_value = if @yaml['depend'][0] == '_'
-      @parent.params["p_#{@yaml['depend']}"]
-    else
-      @record[@yaml['depend']]
-    end
-    
+)
+    # depend field might be virtual field. It's value should be set in params
+    depend_value = @yaml['depend'][0] == '_' ? @parent.params["p_#{@yaml['depend']}"] : @record[@yaml['depend']]
+
     e << " '#{depend_value}'"
     eval e
   end
@@ -120,34 +118,46 @@ end
 ###########################################################################
 # Create choices array for select field.
 ###########################################################################
-def get_choices(all=false)
+def get_choices
   begin
-    choices = case 
-    when @yaml['choices'] then 
-      @yaml['choices']
-    when @yaml['eval']    then
-      choices_in_eval(@yaml['eval'], all)
-    else
-      choices_in_helper(all)
-    end
-  # Convert string to Array
-    choices.class == String ?
-      choices.chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )} :
-      choices
-  rescue Exception => e 
-    Rails.logger.debug "Error in select eval. #{e.message}\n"
+    choices = case
+              when @yaml['eval'] then
+                choices_in_eval(@yaml['eval'])
+              when @yaml['choices'] then
+                @yaml['choices'].match('helpers.') ? choices_in_helper(@yaml['choices']) : @yaml['choices']
+              else
+                choices_in_helper()
+              end
+    return choices unless choices.class == String
+
+    choices.chomp.split(',').map { |e| e.match(':') ? e.split(':') : e }
+  rescue Exception => e
+    Rails.logger.debug "\nError in select eval. #{e.message}\n"
+    Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
     ['error'] # return empty array when error occures
   end
 end
 
+###########################################################################
+# Will add code to view more data about selected option in a window
+###########################################################################
+def add_view_code
+  return '' if (data = @record.send(@yaml['name'])).blank?
+
+  ar = @yaml['view'].split(/\ |\,/).delete_if {|e| e.blank?}
+  table, form_name = *ar
+  url  = @parent.url_for(controller: :cmsedit, id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
+  icon = @parent.fa_icon('eye')
+  %(<span class="dc-window-open" data-url="#{url}">#{icon}</span>)
+end
+
 ###########################################################################
 # Return value when readonly is required
 ###########################################################################
 def ro_standard
-  #value   = @yaml['html']['value'] ? @yaml['html']['value'] : nil
-  value = @record.respond_to?(@yaml['name']) ? @record[@yaml['name']] : nil
-  return self if value.nil?
-# 
+  value = @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
+  return self if value.blank?
+
   choices = get_choices()
   if value.class == Array   # multiple choices
     html = ''
@@ -177,15 +187,22 @@ end
 ###########################################################################
 def render
   return ro_standard if @readonly
+
   set_initial_value('html','selected')
-#
+  # separate options and html part
+  html_part = {}
   @yaml['html'].symbolize_keys!
+  %i(class id style required).each { |sym| html_part[sym] = @yaml['html'].delete(sym) if html_part[sym]}
+  html_part[:multiple] = true if @yaml['multiple']
+
   record = record_text_for(@yaml['name'])
-  if @yaml['multiple']  
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], {multiple: true})
+  if html_part[:multiple]
+    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
     @js   << "$('##{record}_#{@yaml['name']}').selectMultiple();"
   else
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'])
+    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
+    # add code for view more data
+    @html << add_view_code() if @yaml['view']
   end
   self
 end
@@ -196,11 +213,11 @@ end
 def self.get_data(params, name)
   if params['record'][name].class == Array
     params['record'][name].delete_if {|e| e.blank? }
-    return nil if params['record'][name].size == 0
-# convert to BSON objects   
+    return if params['record'][name].size == 0
+
+    # convert to BSON objects
     is_id = BSON::ObjectId.legal?(params['record'][name].first)
     return params['record'][name].map{ |e| BSON::ObjectId.from_string(e) } if is_id
-    return params['record'][name]
   end
   params['record'][name]
 end

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -30,7 +30,7 @@ module DrgcmsFormFields
 # * +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
-# * +not_id+ Field value represent value not an id. Field will save entered value when not selected wit autocomplete.
+# * +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.
@@ -42,6 +42,7 @@ module DrgcmsFormFields
 #      name: user_id
 #      type: text_autocomplete
 #      search: dc_user.name
+#      is_id: false
 #      html:
 #        size: 30
 ###########################################################################
@@ -51,76 +52,80 @@ 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 
-  t = table.classify.constantize
-# find record and return value of field
+  return ro_standard 'Table or field keyword not defined!' unless (table && ret_name)
+  # TODO check if table exists
+  model_klass = table.classify.constantize
+  # 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.
-  if 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
+            @parent.params[value_send_as]
+          elsif @record && @record[@yaml['name']]
+            @record[@yaml['name']]
+          end
+  not_id = @parent.dc_dont?(@yaml['is_id'], false)
+  # Found value to be written in field. If field is not found write out value.
+  value_displayed = value
+  if value && !not_id
+    if BSON::ObjectId.legal?(value)
+      record = model_klass.find(value)
+      value_displayed = record.send(ret_name) if record
+    else
+      value_displayed = model_klass.send(ret_name, method, @parent, value)
+    end
   end
-# 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
+  return ro_standard(value_displayed) if @readonly
+
+  # 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
-# allow unselected values on not_id: true option
-  not_id_code = %Q[
+  @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_code = %(
 if (ui.item == null) {  
 $("##{record}_#{@yaml['name']}").val($("##{record}__#{@yaml['name']}").val() );
 return;
-}
-] if @yaml['not_id']             
-#  
+} ) if not_id
+  #
   @js << <<EOJS
 $(document).ready(function() {
   $("##{record}_#{_name}").autocomplete( {
     source: function(request, response) {
       $.ajax({
-        url: '/dc_common/autocomplete',
+        url: "/dc_common/autocomplete",
         type: "POST",
         dataType: "json",
         data: { input: request.term, table: "#{table}", search: "#{ret_name}" #{(',id: "'+@yaml['id'] + '"') if @yaml['id']} },
@@ -131,11 +136,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
   });
 });
@@ -152,4 +159,5 @@ def self.get_data(params, name)
 end
 
 end
+
 end

data/app/models/drgcms_form_fields.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012+ Damjan Rems
+# Copyright (c) 2020+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,5 +22,16 @@
 #++
 
 module DrgcmsFormFields
+  
+def self.field(parent, record, options) 
+  klass = options['type'].camelize
+  if DrgcmsFormFields.const_defined?(klass)
+    field = DrgcmsFormFields.const_get(klass).new(parent, record, options).render
+    [field.html + (field.js.size > 0 ? @parent.javascript_tag(field.js) : ''),field.css]
+  else
+    nil
+  end
+end
+
 end
 

data/app/renderers/dc_big_menu_renderer.rb

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

data/app/renderers/dc_gallery_renderer.rb

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

data/app/renderers/dc_menu_renderer.rb

@@ -35,6 +35,7 @@
 class DcMenuRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 ########################################################################
 # Object initialization. Will also prepare DcMenu document.
 ########################################################################

data/app/renderers/dc_page_renderer.rb

@@ -36,6 +36,7 @@
 class DcPageRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Object initialization.
@@ -71,6 +72,7 @@ end
 #########################################################################
 def iframe
   return '' if @page.if_url.blank?
+
   html =  "\n<iframe"
   html << " id=\"#{@page.if_id}\"" unless @page.if_id.blank?
   html << " class=\"#{@page.if_class}\"" unless @page.if_class.blank?
@@ -78,7 +80,7 @@ def iframe
   html << " height=\"#{@page.if_height}\"" unless @page.if_height.blank?
   html << " width=\"#{@page.if_width}\"" unless @page.if_width.blank?
   html << " scrolling=\"#{@page.if_scroll}\""
-# Parameters
+  # Parameters
   parameters = @page.if_url.match(/\?/) ? '' : '?' 
   params = YAML.load(@page.if_params) rescue {}
   params = {} unless params.class == Hash
@@ -97,20 +99,20 @@ end
 def default
   can_view, msg = dc_user_can_view(@parent, @page)
   return msg unless can_view
-# 
-  html = ''
+
+  html = "<div class=\"#{@page.div_class} #{@opts[:div_class]}\">"
   html << dc_page_edit_menu() if @opts[:edit_mode] > 1
   @parent.page_title = @page.title.blank? ? @page.subject : @page.title
   html << @page.body
-# render poll if defined
+  # render poll if defined
   if @page.dc_poll_id
     @opts.merge!(:poll_id => @page.dc_poll_id, :return_to => @parent.request.url, method: nil)
     comment = DcPollRenderer.new(@parent, @opts)
     html << "<div class='wrap row'>#{comment.render_html}</div>"
     @css << "\n#{comment.render_css}"
   end
-# also add iframe
-  html << iframe()
+  # also add iframe
+  html << iframe() << '</div>'
 end
 
 #########################################################################

data/app/renderers/dc_part_renderer.rb

@@ -42,6 +42,7 @@
 class DcPartRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Object initialization.

data/app/renderers/dc_piece_renderer.rb

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