drg_cms 0.6.0.6 → 0.6.0.8

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,8 +52,8 @@ 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']
@@ -62,59 +63,58 @@ def render
   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 
+  # 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) 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 ro_standard(value_displayed) if @readonly
-# Add method back, so autocomplete will know that it must search for method inside class
+  # 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
   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 = @parent.dc_dont?(@yaml['is_id'], false)
+  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( {

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.

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.
 ########################################################################

data/app/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,7 +57,7 @@ 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 << ( poll.display == 'in' ? ' *' : '<font color="red"> *</font>' )
@@ -66,7 +67,7 @@ def do_one_item(poll, yaml)
     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>"
@@ -75,34 +76,37 @@ 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
-# Label as placeholder
+  # Label as placeholder
   if poll.display == 'in'
     yaml['html'] ||= {}
     yaml['html']['placeholder'] = text
   end
-# create form_field object and retrieve html code
+  # 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)
     field = clas.new(@parent, @record, yaml).render
-#TODO collect all javascript and add it at the end
-    field.html + (field.js.size > 0 ? @parent.javascript_tag(field.js) : '')
-  else # litle error string
+    @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"
@@ -118,10 +122,10 @@ def do_one_item(poll, yaml)
       end
       @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 fields
+  # other fields
   else
     html << case
       when poll.display == 'lr' then
@@ -156,20 +160,19 @@ 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
+  # 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>'
-  #
   unless poll.pre_display.blank?
     begin
       continue, message = eval_pre_display(poll.pre_display)
@@ -177,48 +180,49 @@ def default
       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
+    # 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
+  # div and form tag
   html <<  "<div class=\"poll-div\">\n"
-# edit link  
+  # 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 << poll.sub_text.to_s
   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
+  # 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
@@ -226,22 +230,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
+  # 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]
   

data/app/renderers/dc_renderer.rb

@@ -32,6 +32,7 @@ class DcRenderer
 ########################################################################
 def initialize( parent, opts={} )
   @parent   = parent
+  @page     = parent.page
   @opts     = opts
   @css = ''
   self

data/app/renderers/dc_simple_menu_renderer.rb

@@ -34,6 +34,7 @@
 class DcSimpleMenuRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 ########################################################################
 # Object initialization.
 ########################################################################

data/config/locales/drgcms_en.yml

@@ -34,8 +34,8 @@ en:
     doc_enabled: Document enabled!
     doc_saved: Document saved!
     doc_info: Info  
-    doc_copy_clipboard: Display document data in new window
-    doc_paste_clipboard: Start update
+    doc_copy_clipboard: Copy document data into new window
+    doc_paste_clipboard: Update or create document
     doc_paste_title: Insert (update) documents from JSON data
     doc_paste_update: Update existing document if document._id exists
     doc_no_delete: Document can not be deleted!
@@ -89,6 +89,7 @@ en:
     reload: Reload
     error: Error!
     errors_no: 'No. of errors:'
+    runtime_error: Runtime error!
     two_chars: type in at least two chars
 
     created_by: Created by

data/config/locales/drgcms_sl.yml

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012-2013 Damjan Rems
+# 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
@@ -28,13 +28,13 @@ sl:
     "false": "ne"    
     record_deleted: Dokument izbrisan!
     confirm_delete: Potrdite izbris dokumenta!
-    confirm_dup: Potrdite podvajanje dokumenta!
+    confirm_dup: Potrdite podvajanja dokumenta!
     not_authorized: Uporabnik nima pravic za to operacijo!
     doc_disabled: Dokument onemogočen!
     doc_enabled:  Dokument omogočen!
     doc_saved: Dokument zapisan!
     doc_info: Info  
-    doc_copy_clipboard: Pripravi vsebino dokumenta v novem oknu.
+    doc_copy_clipboard: Kopija vsebine dokumenta v novem oknu.
     doc_paste_clipboard: Obdelaj podatke    
     doc_paste_title: Ustvari (spremeni) dokumente iz JSON zapisa
     doc_paste_update: Spremeni obstoječ dokument, če dokument._id obstaja
@@ -88,7 +88,8 @@ sl:
     minimize: Pomanjšaj
     reload: Osveži    
     error: Napaka!
-    errors_no: 'Število napak:' 
+    errors_no: 'Število napak:'
+    runtime_error: Napaka med izvajanjem programa!
     two_chars: vpišite vsaj dva znaka
 
     created_by: Ustvaril

data/config/locales/models_en.yml

@@ -127,8 +127,9 @@ en:
         choices4_operation: 'Submit poll:poll_submit,Link:link'
         choices4_display: 'Top:td,Left:lr,Inside:in'
         tab1: Base
-        tab2: Form
+        tab2: Script
         tab3: Items
+        tab4: Items - advanced
 
         name: Poll name
 
@@ -137,7 +138,9 @@ en:
         operation: Operation
         parameters: Parameters
         display: Label
+        pre_display: Pre display code
         css: CSS
+        js: Javascript
         valid_from: Valid from
         valid_to: Valid to
         dc_poll_items: Items
@@ -146,7 +149,7 @@ en:
 
       dc_poll_item:
         tabletitle: Poll items
-        choices4_type: Text:text_field,Text area:text_area,Select:select,Check box:check_box,Submit:submit_tag,Link:link_to,Password:password_field
+        choices4_type: Text:text_field,Text area:text_area,Select:select,Check box:check_box,Submit:submit_tag,Link:link_to,Password:password_field,Radio:radio
         choices4_separator: Space:&nbsp;,Empty line:<br />,Horizontal line:<hr>
 
         name: Name
@@ -165,6 +168,7 @@ en:
         dc_poll_id: Poll name
         created_at: Created date
         data: Data
+        confirmed: Confirmed
 
       dc_policy:
         tabletitle: Access policy declarations
@@ -654,6 +658,8 @@ en:
         parameters: Aditional parameters for operation
         display: How label is positioned related to input field
         css: CSS specific to this poll
+        js: Javascript code specific to this poll
+        pre_display: Method to be run before poll is displayed. Usually for initial filling of form.
         valid_from: Pole is valid from
         valid_to: Pole is valid to
         dc_poll_items: Items for this poll
@@ -675,6 +681,7 @@ en:
         dc_poll_id: Poll name 
         created_at: Date when poll result was submited
         data: Data saved in YAML format
+        confirmed: Poll data was confirmed. Ex. User must click on link in email.
 
       dc_policy:
         name: Unique policy name