drg_cms 0.4.54 → 0.4.57

data/app/models/dc_menu.rb

@@ -35,6 +35,7 @@ class DcMenu
   field :name,        type: String
   field :description, type: String
   field :div_name,    type: String
+  field :link_prepend, type: String
   field :css,         type: String
   field :active,      type: Boolean, default: true 
   field :created_by,  type: BSON::ObjectId

data/app/models/dc_menu_item.rb

@@ -34,6 +34,7 @@ class DcMenuItem
   field :caption,     type: String
   field :picture,     type: String
   field :link,        type: String
+  field :link_prepend, type: String
   field :target,      type: String  
   field :page_id,     type: BSON::ObjectId
   field :order,       type: Integer

data/app/models/dc_simple_menu.rb

@@ -34,6 +34,7 @@ class DcSimpleMenu
   field :name,        type: String
   field :description, type: String
   field :div_name,    type: String
+  field :link_prepend, type: String
   field :css,         type: String
   field :active,      type: Boolean, default: true 
   field :created_by,  type: BSON::ObjectId

data/app/models/dc_simple_menu_item.rb

@@ -45,6 +45,7 @@ class DcSimpleMenuItem
   field :caption,   type: String
   field :picture,   type: String
   field :link,      type: String
+  field :link_prepend, type: String
   field :target,    type: String
   field :order,     type: Integer, default: 10
   field :submenu,   type: String

data/app/models/dc_user.rb

@@ -27,6 +27,7 @@
 module DcUserConcern
 extend ActiveSupport::Concern
 included do
+@@countries = nil
 
 include Mongoid::Document
 include Mongoid::Timestamps
@@ -89,6 +90,23 @@ def do_before_save
   self.email = "unknown@#{self.id}" if self.email.to_s.strip.size < 5
 end  
 
+##########################################################################
+# Will return all possible values for country field ready for input in select field. 
+# Values are loaded from github when method is first called.
+##########################################################################
+def self.choices4_country()
+  if @@countries.nil?
+    uri = URI.parse("https://raw.githubusercontent.com/umpirsky/country-list/master/country/cldr/en/country.json")
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true
+
+    request = Net::HTTP::Get.new(uri.request_uri)
+    response = http.request(request)    
+    @@countries = JSON.parse(response.body).to_a.inject([]) {|result, e| result << [e[1], e[0]] }
+  end
+  @@countries
+end
+
 end
 end
 

data/app/models/drgcms_form_field.rb

@@ -156,6 +156,19 @@ def hash_to_options(hash)
   options.chomp(',')
 end
 
+####################################################################
+# Checks if field name exists in document and alters record parameters if necesary.
+# Method was added after fields that do not belong to current edited document
+# were added to forms. Valid nonexisting form field names must start with underscore (_) letter.
+# 
+# Return: 
+# String: 'record' or '_record' when valid nonexisting field is used
+####################################################################
+def record_text_for(name)
+  (!@record.respond_to?(name) and name[0,1] == '_') ? '_record' : 'record'
+end
+
+
 ###########################################################################
 # Default get_data method for retrieving data from parameters. Class method is called 
 # for every entry field defined on form before field value is saved to database.
@@ -213,7 +226,8 @@ class HiddenField < DrgcmsField
 def render 
   set_initial_value
   value = @yaml['html']['value'] ? @yaml['html']['value'] : @record[@yaml['name']]
-  @parent.hidden_field('record', @yaml['name'], value: value)
+  record = record_text_for(@yaml['name'])  
+  @parent.hidden_field(record, @yaml['name'], value: value)
 end
 end
 
@@ -350,8 +364,10 @@ def render
   _name = '_' + @yaml['name']
   @html << '<table class="ui-autocomplete-table"><td>'
   @html << @parent.link_to(@parent.image_tag('drg_cms/add.png', class: 'dc-link-img'), '#',onclick: 'return false;') # dummy add. But it is usefull.
-  @html << ' ' << @parent.text_field('record', _name, @yaml['html'])                 # text field for autocomplete
-  @html << "<div id =\"record#{@yaml['name']}\">"                            # div to list active records
+
+  record = record_text_for(@yaml['name'])    
+  @html << ' ' << @parent.text_field(record, _name, @yaml['html'])                 # text field for autocomplete
+  @html << "<div id =\"#{record}#{@yaml['name']}\">"                            # div to list active records
 # find value for each field inside categories 
   unless @record[@yaml['name']].nil?
     @record[@yaml['name']].each do |element|
@@ -366,8 +382,8 @@ def render
 # Related data is missing. It happends.
       @html << if rec
         link  = @parent.link_to(@parent.image_tag('drg_cms/x.png', class: 'dc-link-img'), '#',
-                onclick: "$('##{rec.id}').hide(); var v = $('#record_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
-        field = @parent.hidden_field('record', "#{@yaml['name']}_#{rec.id}", value: element)
+                onclick: "$('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
+        field = @parent.hidden_field(record, "#{@yaml['name']}_#{rec.id}", value: element)
         "<div id=\"#{rec.id}\">#{link} #{rec[field_name]}<br>#{field}</div>"
       else
         '** error **'
@@ -377,14 +393,14 @@ def render
   @html << "</div></td></table>"
 # Create text for div to be added when new category is selected  
   link    = @parent.link_to(@parent.image_tag('drg_cms/x.png', class: 'dc-link-img'), '#', 
-            onclick: "$('#rec_id').hide(); var v = $('#record_#{@yaml['name']}_rec_id'); v.val(\"-\" + v.val());return false;")
-  field   = @parent.hidden_field('record', "#{@yaml['name']}_rec_id", value: 'rec_id')
+            onclick: "$('#rec_id').hide(); var 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\">#{link} rec_search<br>#{field}</div>"
     
 # JS stuff    
   @js << <<EOJS
 $(document).ready(function() {
-  $("#record_#{_name}").autocomplete( {
+  $("##{record}_#{_name}").autocomplete( {
     source: function(request, response) {
       $.ajax({
         url: "#{ @parent.url_for( controller: 'dc_common', action: 'autocomplete' )}",
@@ -392,7 +408,6 @@ $(document).ready(function() {
         dataType: "json",
         data: { input: request.term, table: "#{table}", search: "#{search}" #{(',id: "'+@yaml['id'] + '"') if @yaml['id']} },
         success: function(data) {
-/*          alert(data); */
           response( $.map( data, function(key) {
             return key;
           }));
@@ -403,8 +418,8 @@ $(document).ready(function() {
       var div = '#{one_div}';
       div = div.replace(/rec_id/g, ui.item.id)
       div = div.replace('rec_search', ui.item.value)
-      $("#record#{@yaml['name']}").append(div);
-      $("#record_#{_name}").val('');
+      $("##{record}#{@yaml['name']}").append(div);
+      $("##{record}_#{_name}").val('');
     },
     minLength: 2
   });
@@ -464,7 +479,7 @@ def do_eval(e)
 end
   
 ###########################################################################
-# Crete choices array for select field.
+# Create choices array for select field.
 ###########################################################################
 def get_choices
   begin
@@ -481,8 +496,9 @@ def get_choices
     choices.class == String ?
       choices.chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )} :
       choices
-  rescue
-    [] # return empty array when error occures
+  rescue Exception => e 
+    p "Error in select eval. #{e.message}"
+    ['error'] # return empty array when error occures
   end
 end
 
@@ -511,7 +527,8 @@ def render
   set_initial_value('html','selected')
  #
   @yaml['html'].symbolize_keys!
-  @html << @parent.select('record', @yaml['name'], get_choices, @yaml['html'])
+  record = record_text_for(@yaml['name'])  
+  @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'])
   self
 end
 
@@ -534,10 +551,11 @@ def render
 # If choices are present split them to set checked and unchecked value     
   @yaml['checked_value'], @yaml['unchecked_value'] = @yaml['choices'].split(',') if @yaml['choices']
   @yaml['html'].symbolize_keys!
+  record = record_text_for(@yaml['name'])
   @html << if @yaml['checked_value']
-    @parent.check_box('record', @yaml['name'], @yaml['html'], @yaml['checked_value'], @yaml['unchecked_value'] || '0')
+    @parent.check_box(record, @yaml['name'], @yaml['html'], @yaml['checked_value'], @yaml['unchecked_value'] || '0')
   else
-    @parent.check_box('record', @yaml['name'], @yaml['html'])
+    @parent.check_box(record, @yaml['name'], @yaml['html'])
   end
   self
 end
@@ -558,7 +576,8 @@ end
 end
 
 ###########################################################################
-# Implementation of link_to DRG CMS form field.
+# Implementation of link_to DRG CMS form field. link_to form field is mostly used by polls but can
+# be also incorporated in the middle of form.
 ###########################################################################
 class LinkTo < DrgcmsField
   
@@ -582,7 +601,8 @@ end
 end
 
 ###########################################################################
-# Create submit_tag form field
+# Create submit_tag form field. submit_tag form field is mostly used by polls but can
+# be also incorporated in the middle of form.
 ###########################################################################
 class SubmitTag < DrgcmsField
   
@@ -612,7 +632,8 @@ class PasswordField < DrgcmsField
 def render
   return self if @readonly
   @yaml['html'] ||= {}
-  @html << @parent.password_field('record', @yaml['name'], @yaml['html'])
+  record = record_text_for(@yaml['name'])  
+  @html << @parent.password_field(record, @yaml['name'], @yaml['html'])
   self
 end
 end
@@ -634,7 +655,8 @@ def render
   set_initial_value('options','default')
   @yaml['options'].symbolize_keys!
   @yaml['html'].symbolize_keys!
-  @html << @parent.date_select('record', @yaml['name'], @yaml['options'], @yaml['html'])
+  record = record_text_for(@yaml['name'])
+  @html << @parent.date_select(record, @yaml['name'], @yaml['options'], @yaml['html'])
   self
 end
 
@@ -674,7 +696,8 @@ def render
   @yaml['options'].symbolize_keys!
   @yaml['html'].symbolize_keys!
 #
-  @html << @parent.datetime_select('record', @yaml['name'], @yaml['options'], @yaml['html'])
+  record = record_text_for(@yaml['name'])
+  @html << @parent.datetime_select(record, @yaml['name'], @yaml['options'], @yaml['html'])
   self
 end
 
@@ -708,10 +731,11 @@ def render
   @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.date')}'"
   @yaml['options']['timepicker'] = false
 # 
-  @html << @parent.text_field('record', @yaml['name'], @yaml['html'])
+  record = record_text_for(@yaml['name'])
+  @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
   @js << <<EOJS
 $(document).ready(function() {
-  $("#record_#{@yaml['name']}").datetimepicker( {
+  $("##{record}_#{@yaml['name']}").datetimepicker( {
     #{hash_to_options(@yaml['options'])}
   });
 });
@@ -749,10 +773,11 @@ def render
   @yaml['options']['lang']   ||= "'#{I18n.locale}'"
   @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.datetime')}'"
 # 
-  @html << @parent.text_field('record', @yaml['name'], @yaml['html'])
+  record = record_text_for(@yaml['name'])
+  @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
   @js << <<EOJS
 $(document).ready(function() {
-  $("#record_#{@yaml['name']}").datetimepicker( {
+  $("##{record}_#{@yaml['name']}").datetimepicker( {
     #{hash_to_options(@yaml['options'])}
   });
 });
@@ -784,8 +809,7 @@ def render
 # search field name
   if @yaml['search'].class == Hash
     table    = @yaml['search']['table']
-    ret_name = @yaml['search']['field'] || @yaml['search']['search']
-    p 'search:search keyword is replaced with field keyword and will be depricated!' if @yaml['search']['search']
+    ret_name = @yaml['search']['field']
     method   = @yaml['search']['method']
   elsif @yaml['search'].match(/\./)
     table, ret_name, method = @yaml['search'].split('.') 
@@ -827,16 +851,17 @@ def render
   @yaml['html']['value'] = value_displayed
 #    
   _name = '_' + @yaml['name']
-  @html << @parent.text_field('record', _name, @yaml['html'])
+  record = record_text_for(@yaml['name'])  
+  @html << @parent.text_field(record, _name, @yaml['html'])
   if @yaml['with_new']
     @html << @parent.image_tag('drg_cms/add.png', 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
+  @html << @parent.hidden_field(record, @yaml['name'], value: value)        # actual value will be in hidden field
 # JS stuff    
   @js << <<EOJS
 $(document).ready(function() {
-  $("#record_#{_name}").autocomplete( {
+  $("##{record}_#{_name}").autocomplete( {
     source: function(request, response) {
       $.ajax({
         url: '/dc_common/autocomplete',
@@ -844,7 +869,6 @@ $(document).ready(function() {
         dataType: "json",
         data: { input: request.term, table: "#{table}", search: "#{ret_name}" #{(',id: "'+@yaml['id'] + '"') if @yaml['id']} },
         success: function(data) {
-          //alert(data);
           response( $.map( data, function(key) {
             return key;
           }));
@@ -852,7 +876,7 @@ $(document).ready(function() {
       });
     },
     change: function (event, ui) { 
-      $("#record_#{@yaml['name']}").val(ui.item.id);
+      $("##{record}_#{@yaml['name']}").val(ui.item.id);
     },
     minLength: 2
   });
@@ -877,7 +901,9 @@ def render
   @yaml['html'] ||= {}
   value_send_as = 'p_' + @yaml['name']
   @yaml['html']['value'] = @parent.params[value_send_as] if @parent.params[value_send_as]
-  @html << @parent.text_area('record', @yaml['name'], @yaml['html'])
+
+  record = record_text_for(@yaml['name'])
+  @html << @parent.text_area(record, @yaml['name'], @yaml['html'])
   self
 end
 end
@@ -894,7 +920,8 @@ def render
   return ro_standard if @readonly
   set_initial_value
 #
-  @html << @parent.text_field('record', @yaml['name'], @yaml['html'])
+  record = record_text_for(@yaml['name'])
+  @html << @parent.text_field( record, @yaml['name'], @yaml['html']) 
   self
 end
 end
@@ -913,7 +940,8 @@ def render
   return ro_standard if @readonly  
   set_initial_value('html','value')
   
-  @html << @parent.text_field('record', @yaml['name'], @yaml['html'])
+  record = record_text_for(@yaml['name'])
+  @html << @parent.text_field( record, @yaml['name'], @yaml['html']) 
   @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' })
@@ -923,9 +951,9 @@ def render
 $(document).ready(function() {
  $('##{@yaml['name']}_').change( function() {
   if ($(this).val().toString().length > 0) {
-    $('#record_#{@yaml['name']}').val( $(this).val() );
+    $('##{record}_#{@yaml['name']}').val( $(this).val() );
   }
-  $('#record_#{@yaml['name']}').focus();
+  $('##{record}_#{@yaml['name']}').focus();
  });
 });
 EOJS

data/app/views/dc_common/_iframe_edit.html.erb

@@ -0,0 +1,2 @@
+
+<%= iframe_edit1() %>

data/config/locales/drgcms_en.yml

@@ -24,7 +24,7 @@
 # English (en) localization for drgCMS
 en:
   drgcms:
-    doc_deleted: Document deleted!
+    record_deleted: Document deleted!
     confirm_delete: Confirm document deletion!
     confirm_dup: Confirm document duplication!
     not_authorized: User not authorized for this operation!

data/config/locales/models_en.yml

@@ -185,6 +185,7 @@ en:
         description: Description
         div_name: Menu div
         css: CSS
+        link_prepend: Link prepend
         active: Active
         dc_simple_menu_items: Menu items
         dc_site_id: Site
@@ -195,6 +196,7 @@ en:
         caption: Caption
         picture: Picture
         link: Link
+        link_prepend: Link prepend
         target: Target window
         order: Order
         submenu: Submenu
@@ -212,6 +214,7 @@ en:
         description: Description
         div_name: Menu div
         css: CSS
+        link_prepend: Link prepend
         active: Active
         dc_menu_items: Menu items
 
@@ -223,6 +226,7 @@ en:
         caption: Caption
         picture: Picture
         link: Link
+        link_prepend: Link prepend
         target: Target window
         order: Order
         dc_menu_items: Submenus
@@ -277,6 +281,7 @@ en:
 
         name: Name
         description: Description
+        link: Link
         picture: Picture
         thumbnail: Thumbnail
         body: Body
@@ -301,6 +306,7 @@ en:
 
         name: Name
         description: Description
+        link: Link
         picture: Picture
         thumbnail: Thumbnail
         body: Body
@@ -591,6 +597,7 @@ en:
         description: Short description of menu
         css: CSS for this menu
         div_name: Div id name around menu area
+        link_prepend: Link field usually holds direct link to document. Prepand field holds data, that has to be prepanded to the link.
         active: Active
         dc_simple_menu: Menu items
         dc_site_id: Site this menu belongs to
@@ -599,6 +606,7 @@ en:
         caption: Caption of menu
         picture: Picture for the menu
         link: Link called when menu is chosen
+        link_prepend: Link field usually holds direct link to document. Prepand field holds data, that has to be prepanded to the link.
         target: Target window for the link. Leave empty when same window.
         order: Order on which menu item is shown. Lower number means prior position.
         submenu: Submenu captions in form (caption\link).
@@ -611,6 +619,7 @@ en:
         css: CSS for this menu
         div_name: Div id name around menu area
         active: Active
+        link_prepend: Link field usually holds direct link to document. Prepand field holds data, that has to be prepanded to the link.
         dc_menu_items: Menu items
         dc_site_id: Site this menu belongs to
 
@@ -618,6 +627,7 @@ en:
         caption: Caption of menu item
         picture: Picture for the menu
         link: Link called when menu is chosen
+        link_prepend: Link field usually holds direct link to document. Prepand field holds data, that has to be prepanded to the link.
         target: Target window for the link. Leave empty when same window.
         order: Order on which menu item is shown. Lower number means prior position.
         dc_menu_items: Submenu items
@@ -655,6 +665,7 @@ en:
       dc_part:
         name: Parts can be searched by name or by id
         description: Short description of part
+        link: Link when part can be accessed with pretty link
         picture: Picture contents of part
         thumbnail: Small version of picture if available
         body: Content of this part
@@ -675,6 +686,7 @@ en:
         name: Unique name for piece
         description: Short description of piece
         picture: Picture contents of piece
+        link: Link when piece can be accessed with pretty link
         thumbnail: Small version of picture if available
         body: Content of this piece
         css: CSS