drg_cms 0.7.0.2 → 0.7.1.1

data/app/models/drgcms_form_fields/journal_diff.rb

@@ -49,8 +49,8 @@ def render
     old_value = v.class == Array ? v[0] : v
     new_value = v.class == Array ? v[1] : v
     @html << "<div style='background-color: #eee;'>#{@parent.check_box('select', k)} #{k}</div>
-              <div style='background-color: #fcc;'>-<br>#{old_value}</div>
-              <div style='background-color: #cfc;'>+<br>#{new_value}</div><br>"
+              <div style='background-color: #fcc;'>-<br>#{old_value.to_s.gsub("\n", '<br>')}</div>
+              <div style='background-color: #cfc;'>+<br>#{new_value.to_s.gsub("\n", '<br>')}</div><br>"
   end
   @html << '</div>'
   self

data/app/models/drgcms_form_fields/multitext_autocomplete.rb

@@ -24,12 +24,12 @@ module DrgcmsFormFields
 
 ###########################################################################
 # Implementation of multitext_autocomplete DRG Form field.
-# 
+#
 # multitext_autocomplete field is complex data entry field which uses autocomplete
 # function when selecting multiple values for MongoDB Array field. Array typically holds
-# id's of selected documents and control typically displays value of the field name 
+# id's of selected documents and control typically displays value of the field name
 # defined by search options.
-# 
+#
 # ===Form options:
 # * +name:+ field name (required)
 # * +type:+ multitext_autocomplete (required)
@@ -40,12 +40,12 @@ module DrgcmsFormFields
 #   * collection_name.search_field_name.method_name; When searching is more complex custom search
 #   method may be defined in CollectionName model which will provide result set for search.
 # * +with_new+ Will add an icon for shortcut to add new document to collection
-#      
+#
 # Form example:
 #      90:
 #        name: kats
 #        type: multitext_autocomplete
-#        search: dc_category.name      
+#        search: dc_category.name
 #        with_new: model_name
 #        size: 30
 ###########################################################################
@@ -55,106 +55,116 @@ class MultitextAutocomplete < DrgcmsField
 # Returns value for readonly field
 ###########################################################################
 def ro_standard(table, search)
-  result = ''
-  table = table.classify.constantize
-  return self if @record[@yaml['name']].nil?
-# when field name and method are defined together
-  search = search.split('.').first if search.match('.')
-  @record[@yaml['name']].each do |element|
-    result << table.find(element)[search] + '<br>'
-  end
-  super(result)
+  current_values = @record.send(@yaml['name'])
+  return self if current_values.blank?
+
+  table  = table.classify.constantize
+  search = search.split(/\.|\,/).first if search.match(/\.|\,/)
+  html   = current_values.inject('') { |r, element| r << table.find(element)[search] + '<br>' }
+  super(html)
 end
 
 ###########################################################################
 # Render multitext_autocomplete field html code
 ###########################################################################
-def render 
-# search field name
+def render
+  # get field name
   if @yaml['search'].class == Hash
-    table    = @yaml['search']['table']
+    table      = @yaml['search']['table']
     field_name = @yaml['search']['field']
-    method   = @yaml['search']['method']
-    search = method.nil? ? field_name : "#{field_name}.#{method}"
-  elsif @yaml['search'].to_s.match(/\./)
+    method     = @yaml['search']['method']
+    search     = method.nil? ? field_name : "#{field_name}.#{method}"
+  elsif @yaml['search'].to_s.match(/\.|\,/)
     table, field_name, method = @yaml['search'].split(/\.|\,/).map(&:strip)
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   else # search and table name are separated
     search = field_name = @yaml['search']
   end
-# determine table name 
+  # get 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
-      @parent.logger.error "Field #{@yaml['name']}: Invalid table parameter!"
-      nil
-    end
+              @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!"
+              nil
+            end
+  end
+
+  if table.blank? || search.blank?
+    @html << 'Table or search field not defined!'
+    return self
   end
-  unless (table and search)
-    @html << 'Table or search field not defined!' 
+
+  # does collection exists
+  collection = table.classify.constantize rescue nil
+  if collection.nil?
+    @html << "Invalid table name: #{table}"
     return self
   end
-  # 
-  # TODO check if table exists    
-  collection = table.classify.constantize
+
+  # does field exists
   unless @record.respond_to?(@yaml['name'])
-    @html << "Invalid field name: #{@yaml['name']}" 
+    @html << "Invalid field name: #{@yaml['name']}"
     return self
   end
-  # put field to enter search data on form
+
+  # search data entry
   @yaml['html'] ||= {}
   @yaml['html']['value'] = ''   # must be. Otherwise it will look into record and return error
   @yaml['html']['placeholder'] = t('drgcms.search_placeholder')
   _name = '_' + @yaml['name']
   @html << '<div class="ui-autocomplete-border">'
-  @html << @parent.link_to(@parent.fa_icon('plus-square-o', class: 'dc-green'), '#',onclick: 'return false;') # dummy add. But it is usefull.
+  @html << @parent.link_to(@parent.mi_icon('plus-square-o green'), '#', onclick: 'return false;') # dummy add. But it is usefull.
 
+  # text_field for autocomplete
   record = record_text_for(@yaml['name'])
-  # text field for autocomplete
   @html << '<span class="dc-text-autocomplete">' << @parent.text_field(record, _name, @yaml['html']) << '<span></span></span>'
-  # direct link for adding new documents to collection
-  if @yaml['with_new'] and !@readonly
-    @html << ' ' + 
-             @parent.fa_icon('plus-square-o', class: 'in-edit-add', title: t('drgcms.new'),
-             style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
+
+  # link for adding new documents to searched collection
+  if @yaml['with_new'] && !@readonly
+    @html << ' ' +
+             @parent.mi_icon('plus-square-o', class: 'in-edit-add', title: t('drgcms.new'),
+             style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )
   end
+
   # div to list active selections
   @html << "<div id =\"#{record}#{@yaml['name']}\">"
-  # find value for each field inside categories 
-  unless @record[@yaml['name']].nil?
-    @record[@yaml['name']].each do |element|
-# this is quick and dirty trick. We have model dc_big_table which can be used for retrive 
-# more complicated options
+  # fill with current values
+  current_values = @record.send(@yaml['name'])
+  unless current_values.nil?
+    current_values.each do |element|
+  # this is quick and dirty trick. We have model dc_big_table which can be used for retrive
+  # more complicated options
 # TODO retrieve choices from big_table
       rec = if table == 'dc_big_table'
-        collection.find(@yaml['name'], @parent.session)
-      else
-        collection.find(element)
-      end
-# Related data is missing. It happends.
+              collection.find(@yaml['name'], @parent.session)
+            else
+              collection.find(element)
+            end
+
       @html << if rec
-        link  = @parent.link_to(@parent.fa_icon('remove_circle', class: 'dc-red'), '#',
-                onclick: "$('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
-        link  = @parent.fa_icon('check', class: 'dc-green') if @readonly
+        link  = @parent.link_to(@parent.mi_icon('remove_circle red'), '#',
+                onclick: %($('##{rec.id}').hide(); let v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val("-" + v.val());return false;))
+        link  = @parent.mi_icon('check green') if @readonly
         field = @parent.hidden_field(record, "#{@yaml['name']}_#{rec.id}", value: element)
-        "<div id=\"#{rec.id}\" style=\"padding:4px;\">#{link} #{rec.send(field_name)}<br>#{field}</div>"
+        %(<div id="#{rec.id}" style="padding:4px;">#{link} #{rec.send(field_name)}<br>#{field}</div>)
       else
-        '** error **'
+        '** error **'  # Related data is missing. It happends.
       end
     end
   end
   @html << "</div></div>"
-# Create text for div to be added when new category is selected  
-  link    = @parent.link_to(@parent.fa_icon('remove_circle', class: 'dc-red'), '#',
-            onclick: "$('#rec_id').hide(); var v = $('##{record}_#{@yaml['name']}_rec_id'); v.val(\"-\" + v.val());return false;")
+
+  # Create text for div to be added when new category is selected
+  link    = @parent.link_to(@parent.mi_icon('remove_circle red'), '#',
+            onclick: %($('#rec_id').hide(); let 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\" style=\"padding:4px;\">#{link} rec_search<br>#{field}</div>"
-    
-# JS stuff    
+  one_div = %(<div id="rec_id" style="padding:4px;">#{link} rec_search<br>#{field}</div>)
+
+  # JS stuff
   @js << <<EOJS
 $(document).ready(function() {
   $("##{record}_#{_name}").autocomplete( {
@@ -172,11 +182,13 @@ $(document).ready(function() {
       });
     },
     change: function (event, ui) { 
-      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('');
+      let div = '#{one_div}';
+      if (ui.item != null) { 
+        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}_#{_name}").focus();
     },
     minLength: 2
@@ -184,20 +196,20 @@ $(document).ready(function() {
 });
 EOJS
 
-  self 
+  self
 end
 
 ###########################################################################
-# Class method for retrieving data from multitext_autocomplete form field.
+# Class method for retrieving data from multitext_autocomplete form field. Values are sabed
+# in parameters as name_id => id
 ###########################################################################
 def self.get_data(params, name)
   r = []
-  params['record'].each do |k,v| 
-# if it starts with - then it was removed
-    r << BSON::ObjectId.from_string(v) if k.match("#{name}_") and v[0,1] != '-'
+  params['record'].each do |k, v| # inject does not work on params
+    # if it starts with - then it was removed
+    r << BSON::ObjectId.from_string(v) if k.starts_with?("#{name}_") && v[0] != '-'
   end
-  r.uniq!
-  r
+  r.uniq
 end
 
 end

data/app/models/drgcms_form_fields/select.rb

@@ -47,7 +47,9 @@ module DrgcmsFormFields
 # * +depend:+ Select options may depend on a value in some other field. If depend option is specified
 #   then chices must be provided by class method and defined in eval option.
 # * +html:+ html options which apply to select field (optional)
-#      
+# * +with_new:+ model_name.form_name will invoke view dialog for selected option
+# * +with_edit:+ model_name.form_name will invoke edit dialog for selected option
+#
 # Form example:
 #    30:
 #      name: type
@@ -80,9 +82,9 @@ class Select < DrgcmsField
 def choices_in_helper(helper = nil)
   helper ||= "helpers.label.#{@form['table']}.choices4_#{@yaml['name']}"
   c = t(helper)
-  if c.match( 'translation missing' )
+  if c.match(/translation missing/i)
     helper = "choices_for_#{@form['table']}_#{@yaml['name']}"
-    return "Error. #{helper} not defined" if c.match( 'translation missing' )
+    return "Error. #{helper} not defined" if c.match(/translation missing/i)
   end
   c
 end
@@ -95,21 +97,27 @@ 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(e) if respond_to?(method) # is method defined here
+    return eval('@parent.' + e) if @parent.respond_to?(method) # is method defined in helper methods
     # eval whatever it is there
     eval e
   else
-    # add event listener to depend field
-    @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}');});
-});
+    # add event listener to depend field(s)
+    depend_value = ''
+    @js << "\n$(document).ready(function() {\n"
+    @yaml['depend'].split(',') do |depend|
+      depend.strip!
+      depend_value << ',' if depend_value.present?
+      # depend field might be virtual field. It's value should be set in params
+      depend_value << (depend[0] == '_' ? @parent.params["p_#{depend}"] : @record[depend]).to_s
+      next if depend == @yaml['name'] # self may be sent, but don't listen to change event
+
+      @js << %(
+$('#record_#{depend}').change( function(e) { update_select_depend('record_#{@yaml['name']}', '#{@yaml['depend']}', '#{e}');});
+$('#_record_#{depend}').change( function(e) { update_select_depend('record_#{@yaml['name']}', '#{@yaml['depend']}', '#{e}');});
 )
-    # 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']]
-
+    end
+    @js <<  + "});\n"
     e << " '#{depend_value}'"
     eval e
   end
@@ -132,7 +140,7 @@ def get_choices
 
     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.error "\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
@@ -144,9 +152,21 @@ end
 def add_view_code
   return '' if (data = @record.send(@yaml['name'])).blank?
 
-  table, form_name = @yaml['view'].split(/\ |\,/).delete_if { |e| e.blank? }
+  table, form_name = @yaml['with_view'].split(/\ |\,/).delete_if(&:blank)
   url  = @parent.url_for(controller: 'cmsedit', id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
-  icon = @parent.mi_icon('eye-o md-18')
+  icon = @parent.mi_icon('visibility-o md-18')
+  %(<span class="dc-window-open" data-url="#{url}"> #{icon}</span>)
+end
+
+###########################################################################
+# Will add code to view more data about selected option in a window
+###########################################################################
+def add_edit_code
+  return '' if (data = @record.send(@yaml['name'])).blank?
+
+  table, form_name = @yaml['view'].split(/\ |\,/).delete_if(&:blank)
+  url  = @parent.url_for(controller: 'cmsedit', id: data, action: :edit, table: table, form_name: form_name, window_close: 1 )
+  icon = @parent.mi_icon('edit-o md-18')
   %(<span class="dc-window-open" data-url="#{url}"> #{icon}</span>)
 end
 
@@ -176,7 +196,7 @@ def ro_standard
         (html = choice; break) if choice.to_s == value.to_s
       end 
     end
-    html << add_view_code if @yaml['view']
+    html << add_view_code if @yaml['with_view']
   end
   super(html)
 end
@@ -196,12 +216,14 @@ def render
 
   record = record_text_for(@yaml['name'])
   if @yaml['html'][:multiple]
+    @yaml['html']['class'] = "#{@yaml['html']['class']} select-multiple"
     @html << @parent.select(record, @yaml['name'], get_choices, options_part, @yaml['html'])
     @js   << "$('##{record}_#{@yaml['name']}').selectMultiple();"
   else
     @html << @parent.select(record, @yaml['name'], get_choices, options_part, @yaml['html'])
     # add code for view more data
-    @html << add_view_code() if @yaml['view']
+    @html << view_code_add() if @yaml['with_view']
+    @html << edit_code_add() if @yaml['with_edit'] && !@readonly
   end
   self
 end

data/app/models/drgcms_form_fields/text_with_select.rb

@@ -65,9 +65,7 @@ class TextWithSelect < Select
 # Render text_with_select field html code
 ###########################################################################
 def render
-  #return ro_standard if @readonly  
-  set_initial_value('html','value')
-  
+  set_initial_value
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field( record, @yaml['name'], @yaml['html']) 
   @yaml['html']['class'] ||= ''
@@ -80,13 +78,11 @@ def render
   # javascript to update text field if new value is selected in select field
   @js =<<EOJS
 $(document).ready(function() {
- $('##{@yaml['name']}_').change( function() {
-  if ($(this).val().toString().length > 0) {
-    $('##{record}_#{@yaml['name']}').val( $(this).val() );
+  $('##{@yaml['name']}_').on("click", function() {
+    $('##{record}_#{@yaml['name']}').val( $(this).val().toString() );
     $('##{record}_#{@yaml['name']}').trigger("change");
-  }
-  $('##{record}_#{@yaml['name']}').focus();
- });
+    $('##{record}_#{@yaml['name']}').focus();
+  });
 });
 EOJS
   self

data/app/renderers/dc_big_menu_renderer.rb

@@ -1,4 +1,3 @@
-#coding: utf-8
 #--
 # Copyright (c) 2013+ Damjan Rems
 #
@@ -51,9 +50,7 @@ def find_selected #:nodoc:
   while ret and ret.parent != nil
     ret = DcBigMenu.find( ret.parent )
   end
-# return first if not found (something is wrong)
-#  p ret
-  ret ||= DcBigMenu.where(dc_site_id: @site._id, parent: nil, active: true).limit(1).first
+  ret || DcBigMenu.where(dc_site_id: @site._id, parent: nil, active: true).limit(1).first
 end
 
 ########################################################################
@@ -78,7 +75,7 @@ def link_4menu(item) #:nodoc:
   html = ''
   link = item.link
   link = "/#{@site.route_name}/#{item.page_id}" #if link.blank?
-#  
+
   html << @parent.link_to(item.picture, link) unless item.picture.blank?
   html << if !item.caption.blank?
     # TODO Translation
@@ -91,23 +88,23 @@ end
 ########################################################################
 def left_menu
   html = ''
-  m = DcBigMenu.find( @parent.page.menu_id )
-# Show menu on same level if selected has no children
+  menu = DcBigMenu.find( @parent.page.menu_id )
+  # Show menu on same level if selected has no children
   if DcBigMenu.where( parent: @parent.page.menu_id ).limit(1).to_a.size == 0
-    m = DcBigMenu.find( m.parent )
+    menu = DcBigMenu.find( m.parent )
   end    
-#     
-  html << "<div class='menu-left-item-top'>#{m.caption}</div>"
-  DcBigMenu.where( parent: m._id ).sort(order: 1).each do |item|
+
+  html << "<div class='menu-left-item-top'>#{menu.caption}</div>"
+  DcBigMenu.where( parent: menu.id ).order(order: 1).each do |item|
     html << (item._id == @parent.page.menu_id ? '<div class="menu-left-item-selected">' : '<div class="menu-left-item">')
     html << link_4menu(item) 
     html << '</div>'
   end
-#  
+
   html << "<div class='menu-left-item-bottom'>"
-  if m.parent
-    p = DcBigMenu.find( m.parent )
-    html << "&#9650; #{link_4menu(p)}"
+  if menu.parent
+    parent = DcBigMenu.find( menu.parent )
+    html << "&#9650; #{link_4menu(parent)}"
   end
   html << '&nbsp;</div>' 
 end
@@ -124,14 +121,14 @@ def path
     m = DcBigMenu.find( m.parent )
     a << m
   end
-#  
+
   (a.size - 1).downto(0) do |i| 
     html << "<span id=menu-path-#{a.size - 1 - i}>"
     html << link_4menu(a[i]) 
     html << (i > 0 ? ' &raquo; ' : '') #&rsaquo;&#10132;
     html << '</span>'
   end
-# Save level to parents params object
+  # Save level to parents params object
   @parent.params[:menu_level] = a.size
   html
 end
@@ -144,20 +141,21 @@ def default
   @selected = find_selected
   level_0 = DcBigMenu.where(dc_site_id: @site._id, parent: nil, active: true).sort(order: 1).to_a
   level_0.each do |item|
-# menu can be hidden from user    
+    # menu can be hidden from user
     can_view, msg = dc_user_can_view(@parent, item)
     next unless can_view
+
     klas = item.id == @selected.id ? "menu0-selected" : "menu0-item"
     html << "<li class='#{klas}'>#{ link_4menu(item) }</li>\n"
   end
   html << "</ul></div>"
-# submenu
+  # submenu
   level_1 = DcBigMenu.where(dc_site_id: @site._id, parent: @selected.id, active: true).sort(order: 1).to_a
   html << "<div class='menu1-div'><ul>\n"
   level_1.each do |item1|
-# menu can be hidden from user    
     can_view, msg = dc_user_can_view(@parent, item1)
     next unless can_view
+
     html << "  <li class='menu1-item'>#{link_4menu(item1)}</li>\n"
   end
   html << '</ul></div>'

data/app/renderers/dc_gallery_renderer.rb

@@ -52,14 +52,20 @@ end
 def default
   can_view, msg = dc_user_can_view(@parent, @page)
   return msg unless can_view
-# 
+
   html = '<div class="picture-gallery"><ul>'
   DcGallery.where(doc_id: @opts[:doc_id], active: true).order_by(order: 1).each do |picture|
     html << '<li>'
-    html << edit_menu(picture) if @opts[:edit_mode] > 1
+    if @opts[:edit_mode] > 1
+      html << edit_menu(picture)
+      html << %(
+      <span class="dc-inline-link dc-link-ajax" data-url="/cmsedit/run?control=DcGalleryControl.picture_remove;id=#{picture.id};table=DcGallery"
+        data-confirm="#{t('drgcms.confirm_delete')}" title="#{t('drgcms.delete')}">
+        <i class="mi-o mi-delete"></i>
+      </span>)
+    end
     html << "#{@parent.link_to(i@parent.mage_tag(picture.thumbnail, title: picture.title), picture.picture)}<li>"
   end
-# 
   html << '</ul></div>'
 end
 
@@ -88,7 +94,7 @@ def edit_menu(picture)
   opts[:id]    = picture.id
   opts[:table] = 'dc_gallery'
   
-  '<li>'+dc_link_for_edit(opts)+'</li>'
+  '<li>' + dc_link_for_edit(opts) + '</li>'
 end