drg_cms 0.5.10 → 0.5.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 731ea3ef7879ed33a901605b0a9dddb861d1ec31
-  data.tar.gz: 8760d04c45460f00c4083babcb75470d7bdd5b5b
+  metadata.gz: 13427f3d66b3e41332787f5e5a1b9136c65874d7
+  data.tar.gz: cb7dd4a48763fc5da35b1e6f009f29687ebd4449
 SHA512:
-  metadata.gz: 46394f7291cc085caf7957769d8f91bbf6ad3e1e282b6a83f49d7c32a7910c00e66b60855bb8cc3ee01259ef93c946158b93eed46d84cf585ba262d55b68b7f7
-  data.tar.gz: dd46dc3424bb88f5053f1d2e9d313f12f71553127754147ea4de7719645d57c6cd3b7c2f1c57baebaef489a05347efee310c85ab97d3dadeaf99aebd6aab418e
+  metadata.gz: 4ae87d5b1417d792d1c253f5d623b032c6b8a0b19e08b89efe1e2631b4c6488acd5cdf55891ef937edec4e049da3970d28ab1e197eda1efb101f2b8d40abb80f
+  data.tar.gz: 2cce2a337d7da3f95dda769dfb330ba03d7b5e14481749326522618a7853c67138feaf26bb73fbbc4e0396940838d7a0056708aeb9d187fddcf9be454c5b9616

data/History.log

@@ -4,6 +4,7 @@ New features for DRG CMS version 0.5.10
     jQuery javascript library forced to jQuery2
     Choices for select fields are now UTF-8 sorted since MongoDB does not provide utf sorting.
     Placeholder text added for text_autocomplete field. It can also be defined in form field html options.
+    Filters option can now have "like" keyword for fields that are not defined on form. For example created_by like user_id.
     
 Bugs resolved for DRG CMS version 0.5.10
 

data/app/assets/javascripts/drg_cms/select-multiple.js

@@ -0,0 +1,459 @@
+/*
+* SelectMultiple v0.1
+* Copyright (c) 2015 krazedkrish( Shalil Awaley )
+*
+* This program is free software. It comes without any warranty, to
+* the extent permitted by applicable law. You can redistribute it
+* and/or modify it under the terms of the MIT LICENSE.
+* See https://en.wikipedia.org/wiki/MIT_License for more details.
+*/
+
+!function ($) {
+
+  "use strict";
+
+
+ /* SELECTMULTIPLE CLASS DEFINITION
+  * ====================== */
+
+  var SelectMultiple = function (element, options) {
+    this.options = options;
+    this.$element = $(element);
+    this.$container = $('<div/>', { 'class': "ms-container" });
+    this.$selectableContainer = $('<div/>', { 'class': 'ms-selectable' });
+    this.$selectableUl = $('<ul/>', { 'class': "ms-list", 'tabindex' : '-1' });
+    this.scrollTo = 0;
+    this.elemsSelector = 'li';
+  };
+
+  SelectMultiple.prototype = {
+    constructor: SelectMultiple,
+
+    init: function(){
+      var that = this,
+          ms = this.$element;
+
+      if (ms.next('.ms-container').length === 0){
+        ms.css({ position: 'absolute', left: '-9999px' });
+        ms.attr('id', ms.attr('id') ? ms.attr('id') : Math.ceil(Math.random()*1000)+'selectmultiple');
+        this.$container.attr('id', 'ms-'+ms.attr('id'));
+        this.$container.addClass(that.options.cssClass);
+        ms.find('option').each(function(){
+          that.generateLisFromOption(this);
+        });
+
+
+        if (that.options.selectableHeader){
+          that.$selectableContainer.append(that.options.selectableHeader);
+        }
+        that.$selectableContainer.append(that.$selectableUl);
+        if (that.options.selectableFooter){
+          that.$selectableContainer.append(that.options.selectableFooter);
+        }
+
+
+        that.$container.append(that.$selectableContainer);
+        ms.after(that.$container);
+
+        that.activeMouse(that.$selectableUl);
+        that.activeKeyboard(that.$selectableUl);
+
+        var action = that.options.dblClick ? 'dblclick' : 'click';
+
+        that.$selectableUl.on(action, '.ms-elem-selectable', function(){
+          that.select($(this).data('ms-value'));
+        });
+
+
+        ms.on('focus', function(){
+          that.$selectableUl.focus();
+        })
+      }
+
+      var selectedValues = ms.find('option:selected').map(function(){ return $(this).val(); }).get();
+      that.select(selectedValues, 'init');
+
+      if (typeof that.options.afterInit === 'function') {
+        that.options.afterInit.call(this, this.$container);
+      }
+    },
+
+    'generateLisFromOption' : function(option, index, $container){
+      var that = this,
+          ms = that.$element,
+          attributes = "",
+          $option = $(option);
+
+      for (var cpt = 0; cpt < option.attributes.length; cpt++){
+        var attr = option.attributes[cpt];
+
+        if(attr.name !== 'value' && attr.name !== 'disabled'){
+          attributes += attr.name+'="'+attr.value+'" ';
+        }
+      }
+      var selectableLi = $('<li '+attributes+'><span>'+that.escapeHTML($option.text())+'</span><span class="pull-right ms-elem-selected">✔</span></li>'),
+          selectedLi = selectableLi.clone(),
+          value = $option.val(),
+          elementId = that.sanitize(value);
+
+      selectableLi.children('.ms-elem-selected').hide();
+
+      selectableLi
+        .data('ms-value', value)
+        .addClass('ms-elem-selectable')
+        .attr('id', elementId+'-selectable');
+
+
+      if ($option.prop('disabled') || ms.prop('disabled')){
+        selectableLi.addClass(that.options.disabledClass);
+      }
+
+      var $optgroup = $option.parent('optgroup');
+
+      if ($optgroup.length > 0){
+        var optgroupLabel = $optgroup.attr('label'),
+            optgroupId = that.sanitize(optgroupLabel),
+            $selectableOptgroup = that.$selectableUl.find('#optgroup-selectable-'+optgroupId);
+
+        if ($selectableOptgroup.length === 0){
+          var optgroupContainerTpl = '<li class="ms-optgroup-container"></li>',
+              optgroupTpl = '<ul class="ms-optgroup"><li class="ms-optgroup-label"><span>'+optgroupLabel+'</span></li></ul>';
+
+          $selectableOptgroup = $(optgroupContainerTpl);
+          $selectableOptgroup.attr('id', 'optgroup-selectable-'+optgroupId);
+          $selectableOptgroup.append($(optgroupTpl));
+          if (that.options.selectableOptgroup){
+            $selectableOptgroup.find('.ms-optgroup-label').on('click', function(){
+              var values = $optgroup.children(':not(:selected, :disabled)').map(function(){ return $(this).val() }).get();
+              that.select(values);
+            });
+          }
+          that.$selectableUl.append($selectableOptgroup);
+        }
+        index = index == undefined ? $selectableOptgroup.find('ul').children().length : index + 1;
+        selectableLi.insertAt(index, $selectableOptgroup.children());
+      } else {
+        index = index == undefined ? that.$selectableUl.children().length : index;
+
+        selectableLi.insertAt(index, that.$selectableUl);
+      }
+    },
+
+    'addOption' : function(options){
+      var that = this;
+
+      if (options.value !== undefined && options.value !== null){
+        options = [options];
+      }
+      $.each(options, function(index, option){
+        if (option.value !== undefined && option.value !== null &&
+            that.$element.find("option[value='"+option.value+"']").length === 0){
+          var $option = $('<option value="'+option.value+'">'+option.text+'</option>'),
+              index = parseInt((typeof option.index === 'undefined' ? that.$element.children().length : option.index)),
+              $container = option.nested == undefined ? that.$element : $("optgroup[label='"+option.nested+"']")
+
+          $option.insertAt(index, $container);
+          that.generateLisFromOption($option.get(0), index, option.nested);
+        }
+      })
+    },
+
+    'escapeHTML' : function(text){
+      return $("<div>").text(text).html();
+    },
+
+    'activeKeyboard' : function($list){
+      var that = this;
+
+      $list.on('focus', function(){
+        $(this).addClass('ms-focus');
+      })
+      .on('blur', function(){
+        $(this).removeClass('ms-focus');
+      })
+      .on('keydown', function(e){
+        switch (e.which) {
+          case 40:
+          case 38:
+            e.preventDefault();
+            e.stopPropagation();
+            that.moveHighlight($(this), (e.which === 38) ? -1 : 1);
+            return;
+          case 9:
+            if(that.$element.is('[tabindex]')){
+              e.preventDefault();
+              var tabindex = parseInt(that.$element.attr('tabindex'), 10);
+              tabindex = (e.shiftKey) ? tabindex-1 : tabindex+1;
+              $('[tabindex="'+(tabindex)+'"]').focus();
+              return;
+            }else{
+              if(e.shiftKey){
+                that.$element.trigger('focus');
+              }
+            }
+        }
+        if($.inArray(e.which, that.options.keySelect) > -1){
+          e.preventDefault();
+          e.stopPropagation();
+          that.selectHighlighted($list);
+          return;
+        }
+      });
+    },
+
+    'moveHighlight': function($list, direction){
+      var $elems = $list.find(this.elemsSelector),
+          $currElem = $elems.filter('.ms-hover'),
+          $nextElem = null,
+          elemHeight = $elems.first().outerHeight(),
+          containerHeight = $list.height(),
+          containerSelector = '#'+this.$container.prop('id');
+
+      $elems.removeClass('ms-hover');
+      if (direction === 1){ // DOWN
+
+        $nextElem = $currElem.nextAll(this.elemsSelector).first();
+        if ($nextElem.length === 0){
+          var $optgroupUl = $currElem.parent();
+
+          if ($optgroupUl.hasClass('ms-optgroup')){
+            var $optgroupLi = $optgroupUl.parent(),
+                $nextOptgroupLi = $optgroupLi.next(':visible');
+
+            if ($nextOptgroupLi.length > 0){
+              $nextElem = $nextOptgroupLi.find(this.elemsSelector).first();
+            } else {
+              $nextElem = $elems.first();
+            }
+          } else {
+            $nextElem = $elems.first();
+          }
+        }
+      } else if (direction === -1){ // UP
+
+        $nextElem = $currElem.prevAll(this.elemsSelector).first();
+        if ($nextElem.length === 0){
+          var $optgroupUl = $currElem.parent();
+
+          if ($optgroupUl.hasClass('ms-optgroup')){
+            var $optgroupLi = $optgroupUl.parent(),
+                $prevOptgroupLi = $optgroupLi.prev(':visible');
+
+            if ($prevOptgroupLi.length > 0){
+              $nextElem = $prevOptgroupLi.find(this.elemsSelector).last();
+            } else {
+              $nextElem = $elems.last();
+            }
+          } else {
+            $nextElem = $elems.last();
+          }
+        }
+      }
+      if ($nextElem.length > 0){
+        $nextElem.addClass('ms-hover');
+        var scrollTo = $list.scrollTop() + $nextElem.position().top -
+                       containerHeight / 2 + elemHeight / 2;
+
+        $list.scrollTop(scrollTo);
+      }
+    },
+
+    'selectHighlighted' : function($list){
+      var $elems = $list.find(this.elemsSelector),
+          $highlightedElem = $elems.filter('.ms-hover').first();
+
+      if ($highlightedElem.length > 0){
+        if ($list.parent().hasClass('ms-selectable')){
+          this.select($highlightedElem.data('ms-value'));
+        } else {
+          this.deselect($highlightedElem.data('ms-value'));
+        }
+        $elems.removeClass('ms-hover');
+      }
+    },
+
+    'activeMouse' : function($list){
+      var that = this;
+
+      $('body').on('mouseenter', that.elemsSelector, function(){
+        $(this).parents('.ms-container').find(that.elemsSelector).removeClass('ms-hover');
+        $(this).addClass('ms-hover');
+      });
+
+      $('body').on('mouseleave', that.elemsSelector, function () {
+          $(this).parents('.ms-container').find(that.elemsSelector).removeClass('ms-hover');;
+      });
+    },
+
+    'refresh' : function() {
+      this.destroy();
+      this.$element.selectMultiple(this.options);
+    },
+
+    'destroy' : function(){
+      $("#ms-"+this.$element.attr("id")).remove();
+      this.$element.css('position', '').css('left', '')
+      this.$element.removeData('selectmultiple');
+    },
+
+    'select' : function(value, method){
+      if (typeof value === 'string'){ value = [value]; }
+
+      var that = this,
+          ms = this.$element,
+          msIds = $.map(value, function(val){ return(that.sanitize(val)); }),
+          selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable').filter(':not(.'+that.options.disabledClass+')'),
+          options = ms.find('option:not(:disabled)').filter(function(){ return($.inArray(this.value, value) > -1); });
+
+      if (method === 'init'){
+        selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable');
+      }
+
+      if (selectables.length > 0){
+        selectables.addClass('ms-selected').children('.ms-elem-selected').show();
+
+        if (method !== 'init' && options.prop('selected') == true) {
+          that.deselect(value, method);
+          return;
+        }
+
+        options.prop('selected', true);
+
+        var selectableOptgroups = that.$selectableUl.children('.ms-optgroup-container');
+        if (selectableOptgroups.length > 0){
+          selectableOptgroups.each(function(){
+            var selectablesLi = $(this).find('.ms-elem-selectable');
+            if (that.options.hideOptGroupLabelOnAllSelected !== false && selectablesLi.length === selectablesLi.filter('.ms-selected').length){
+              $(this).find('.ms-optgroup-label').hide();
+            }
+          });
+
+        }
+        if (method !== 'init'){
+          ms.trigger('change');
+          if (typeof that.options.afterSelect === 'function') {
+            that.options.afterSelect.call(this, value);
+          }
+        }
+      }
+    },
+
+    'deselect' : function(value, method){
+      if (typeof value === 'string'){ value = [value]; }
+
+      var that = this,
+          ms = this.$element,
+          msIds = $.map(value, function(val){ return(that.sanitize(val)); }),
+          selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable'),
+          options = ms.find('option').filter(function(){ return($.inArray(this.value, value) > -1); });
+
+      selectables.removeClass('ms-selected').children('.ms-elem-selected').hide();
+      options.prop('selected', false);
+
+      var selectableOptgroups = that.$selectableUl.children('.ms-optgroup-container');
+      if (selectableOptgroups.length > 0){
+        selectableOptgroups.each(function(){
+          var selectablesLi = $(this).find('.ms-elem-selectable');
+          if (selectablesLi.filter(':not(.ms-selected)').length > 0){
+            $(this).find('.ms-optgroup-label').show();
+          }
+        });
+
+      }
+      if (method !== 'init'){
+        ms.trigger('change');
+        if (typeof that.options.afterDeselect === 'function') {
+          that.options.afterDeselect.call(this, value);
+        }
+      }
+    },
+
+    'select_all' : function(){
+      var ms = this.$element,
+          values = ms.val();
+
+      ms.find('option:not(":disabled")').prop('selected', true);
+      this.$selectableUl.find('.ms-elem-selectable').filter(':not(.'+this.options.disabledClass+')').addClass('ms-selected').children('.ms-elem-selected').show();
+      if(this.options.hideOptGroupLabelOnAllSelected !== false){
+         this.$selectableUl.find('.ms-optgroup-label').hide(); 
+      }
+      ms.trigger('change');
+      if (typeof this.options.afterSelect === 'function') {
+        var selectedValues = $.grep(ms.val(), function(item){
+          return $.inArray(item, values) < 0;
+        });
+        this.options.afterSelect.call(this, selectedValues);
+      }
+    },
+
+    'deselect_all' : function(){
+      var ms = this.$element,
+          values = ms.val();
+
+      ms.find('option').prop('selected', false);
+      this.$selectableUl.find('.ms-elem-selectable').removeClass('ms-selected').children('.ms-elem-selected').hide();
+      this.$selectableUl.find('.ms-optgroup-label').show();
+      this.$selectableUl.focus();
+      ms.trigger('change');
+      if (typeof this.options.afterDeselect === 'function') {
+        this.options.afterDeselect.call(this, values);
+      }
+    },
+
+    sanitize: function(value){
+      var hash = 0, i, character;
+      if (value.length == 0) return hash;
+      var ls = 0;
+      for (i = 0, ls = value.length; i < ls; i++) {
+        character  = value.charCodeAt(i);
+        hash  = ((hash<<5)-hash)+character;
+        hash |= 0; // Convert to 32bit integer
+      }
+      return hash;
+    }
+  };
+
+  /* SELECTMULTIPLE PLUGIN DEFINITION
+   * ======================= */
+
+  $.fn.selectMultiple = function () {
+    var option = arguments[0],
+        args = arguments;
+
+    return this.each(function () {
+      var $this = $(this),
+          data = $this.data('selectmultiple'),
+          options = $.extend({}, $.fn.selectMultiple.defaults, $this.data(), typeof option === 'object' && option);
+
+      if (!data){ $this.data('selectmultiple', (data = new SelectMultiple(this, options))); }
+
+      if (typeof option === 'string'){
+        data[option](args[1]);
+      } else {
+        data.init();
+      }
+    });
+  };
+
+  $.fn.selectMultiple.defaults = {
+    keySelect: [32],
+    selectableOptgroup: false,
+    disabledClass : 'disabled',
+    dblClick : false,
+    cssClass: '',
+    hideOptGroupLabelOnAllSelected: true
+  };
+
+  $.fn.selectMultiple.Constructor = SelectMultiple;
+
+  $.fn.insertAt = function(index, $parent) {
+    return this.each(function() {
+      if (index === 0) {
+        $parent.prepend(this);
+      } else {
+        $parent.children().eq(index - 1).after(this);
+      }
+    });
+}
+
+}(window.jQuery);

data/app/assets/javascripts/drg_cms_cms.js

@@ -26,7 +26,8 @@
 //= #require drg_cms/elfinder/js/elfinder.min.js
 //= #require drg_cms/elfinder/js/proxy/elFinderSupportVer1.js
 
-//= #require drg_cms/jquery.the-modal.js
 //= require drg_cms/jquery.bpopup.min.js
+//= require drg_cms/select-multiple
+
 
 

data/app/assets/stylesheets/drg_cms/select-multiple.css

@@ -0,0 +1,93 @@
+.ms-container{
+  width: 200px;
+}
+
+.ms-container:after{
+  content: ".";
+  display: block;
+  height: 0;
+  line-height: 0;
+  font-size: 0;
+  clear: both;
+  min-height: 0;
+  visibility: hidden;
+}
+
+.ms-container .ms-selectable, .ms-container .ms-selection{
+  background: #fff;
+  color: #555555;
+  /*float: left;*/
+}
+
+.ms-container .ms-list{
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  position: relative;
+  height: 200px;
+  padding: 0;
+  overflow-y: auto;
+}
+
+.ms-container .ms-list.ms-focus{
+  border-color: rgba(82, 168, 236, 0.8);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  outline: 0;
+  outline: thin dotted \9;
+}
+
+.ms-container ul{
+  margin: 0;
+  list-style-type: none;
+  padding: 0;
+}
+
+.ms-container .ms-optgroup-container{
+  width: 100%;
+}
+
+.ms-container .ms-optgroup-label{
+  margin: 0;
+  padding: 5px 0px 0px 5px;
+  cursor: pointer;
+  color: #999;
+}
+
+.ms-container .ms-selectable li.ms-elem-selectable{
+  border-bottom: 1px #eee solid;
+  padding: 2px 10px;
+  color: #555;
+  font-size: 14px;
+}
+
+.ms-container .ms-selectable li.ms-hover{
+  cursor: pointer;
+  color: #fff;
+  text-decoration: none;
+  background-color: #08c;
+}
+
+.ms-container .ms-selectable li.disabled{
+  background-color: #eee;
+  color: #aaa;
+  cursor: text;
+}
+
+.ms-container .ms-selectable li span.ms-elem-selected {
+  display: none;
+}
+
+.pull-right.ms-elem-selected{
+  float: right;
+}

data/app/assets/stylesheets/drg_cms_application.css

@@ -10,4 +10,5 @@
  *
  *= require drg_cms/drg_cms
  *= require font-awesome
+
 */

data/app/assets/stylesheets/drg_cms_cms.css

@@ -10,13 +10,13 @@
  *
  *= require drg_cms/drg_cms
  *= require drg_cms/jquery.datetimepicker.css
+ *= require drg_cms/select-multiple
  *= #require jquery-ui/all  
  *= require jquery-ui/tooltip
  *= require jquery-ui/autocomplete
  *= #require ../javascripts/drg_cms/elfinder/css/elfinder.min.css
  *= #require ../javascripts/drg_cms/elfinder/css/theme.css
  *= require font-awesome
- *= #require drg_cms/the-modal.css
 */
 
 /* Required for link buttons to look alike */

data/app/controllers/cmsedit_controller.rb

@@ -195,6 +195,15 @@ def check_filter_options() #:nodoc:
       model
     end
   end
+=begin  
+# TODO Use only fields requested. Higly experimental but necessary in some scenarios
+  if (columns = @form['result_set']['columns'])
+    cols = []
+    columns.each { |k,v| cols << v['name'] }
+    p '*',cols,'*'
+    @records = @records.only(cols)
+  end
+=end  
 # pagination if required
   per_page = (@form['result_set']['per_page'] || 30).to_i
   if per_page > 0
@@ -393,6 +402,12 @@ def create
   end
 #
   if params['id'].nil? # create record
+# Prevent double form submit
+    params[:form_time_stamp] = params[:form_time_stamp].to_i
+    session[:form_time_stamp] ||= 0
+    return index if params[:form_time_stamp] <= session[:form_time_stamp]
+    session[:form_time_stamp] = params[:form_time_stamp]
+#    
     create_new_empty_record
     params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
     if save_data

data/app/controllers/dc_application_controller.rb

@@ -70,7 +70,7 @@ def dc_user_has_role(role)
     role = DcPolicyRole.find_by(name: rol)
     role = DcPolicyRole.find_by(system_name: rol) if role.nil?
   end
-  return false if role.nil?
+  return false if role.nil? or session[:user_roles].nil?
 # role is found in user_roles
   session[:user_roles].include?(role._id)
 end
@@ -200,7 +200,7 @@ def dc_user_can(permission, table=params[:table])
   end
 # Sometimes anonymous user is allowed to use cmsedit. Search for system default role.
 #TODO This might not be the best idea. Check in the future.
-  if session[:user_roles].nil?
+  if session[:user_roles].nil? or session[:user_roles] == []
     guest = DcUserRole.find_by(:system_name => 'guest')
     session[:user_roles] = guest ? [guest.id] : []
   end
@@ -294,6 +294,8 @@ def dc_process_default_request()
   dc_set_options(@site.settings)
 # HOMEPAGE. When no parameters is set
   params[:path] = @site.homepage_link if params[:id].nil? and params[:path].nil?
+# some other process request. It shoud fail if not defined
+  return eval(@site.request_processor) if !@site.request_processor.blank?
 # Search for page 
   pageclass = @site.page_table.classify.constantize
   if params[:id]
@@ -359,11 +361,13 @@ end
 # # Just a reminder: request.session_options[:skip] = true
 ##########################################################################
 def dc_single_sitedoc_request
-  session[:edit_mode] ||= 0
-  @site = dc_get_site
-# @site is not defined. render 404 error
-  return dc_render_404('Site!') unless @site
-  dc_set_options(@site.settings)
+  if @site.nil?
+    session[:edit_mode] ||= 0
+    @site = dc_get_site
+  # @site is not defined. render 404 error
+    return dc_render_404('Site!') unless @site
+    dc_set_options(@site.settings)
+  end
 # HOMEPAGE. When no parameters is set
   params[:path] = @site.homepage_link if params[:path].nil?  
   @parts = @site.dc_parts

data/app/forms/all_options.yml

@@ -85,6 +85,7 @@ result_set:
     4: 
       name: active
       eval: dc_icon4_boolean
+      eval: dc_name4_value      
 
 form:
   title: 
@@ -133,6 +134,7 @@ form:
       40:
         name: dc_site_id
         type: select
+        multiple: true || 1
         eval: dc_choices4('model','description_field_name','_id')
         eval: ModelName.choices4_site
         html:

data/app/forms/dc_site.yml

@@ -57,14 +57,18 @@ form:
         type: text_field
         size: 50
       70:
-        name: files_directory
+        name: request_processor
         type: text_field
         size: 50
       80:
+        name: files_directory
+        type: text_field
+        size: 50
+      90:
         name: logo
         type: file_select
         size: 50
-      90:
+      100:
         name: active
         type: check_box
         size: 50

data/app/helpers/cmsedit_helper.rb

@@ -101,7 +101,7 @@ EOT
       s = session[@form['table']]
       if s and s[:filter]
         caption << '&nbsp;&nbsp;' + dc_link_to(nil,'remove lg', {controller: 'cmsedit', 
-                   filter: 'off', table: @form['table']}, { title: t('drgcms.filter_off')+s[:filter]}) 
+                   filter: 'off', table: @form['table']}, { title: DcFilter.title4_filter_off(s[:filter]) }) 
       end
       caption
 # new
@@ -161,7 +161,7 @@ def dc_div_filter()
 
       </td>
       <td class="dc-link dc-animate drgcms_popup_submit" data-url="#{url}">#{fa_icon('check-square-o')} #{t('drgcms.filter_on')}</td>
-      <td class="dc-link dc-animate">#{dc_link_to('drgcms.filter_off','close', {action: 'index', filter: 'off', :table => @form['table']}) }</td>
+      <td class="dc-link dc-animate">#{dc_link_to('drgcms.filter_off','close', {action: :index, filter: 'off', table: @form['table'], formname: params['formname']}) }</td>
     </table>
 </div>
 EOT
@@ -188,7 +188,8 @@ def dc_link_or_ajax(yaml, parms) #:nodoc:
   rest = {}
   rest['method']  = yaml['method'] || yaml['request'] || 'get'
   rest['caption'] = yaml['caption'] || yaml['text']
-  rest['class']   = (yaml['type'] == 'link' ? 'dc-link' : 'dc-link-ajax') + ' dc-animate'
+#  rest['class']   = (yaml['type'] == 'link' ? 'dc-link' : 'dc-link-ajax') + ' dc-animate'
+  rest['class']   = 'dc-animate'
   rest['title']   = yaml['title']
   
   dc_deprecate "Form: result_set:action:text directive will be deprecated. Use caption instead of text." if yaml['text']
@@ -373,55 +374,55 @@ end
 ############################################################################
 def dc_columns_for_result(document)
   html = ''  
-  if (columns = @form['result_set']['columns'])
-    columns.each do |k,v|
-      session[:form_processing] = "result_set:columns: #{k}=#{v}"
+  return html unless @form['result_set']['columns']
+#  
+  @form['result_set']['columns'].each do |k,v|
+    session[:form_processing] = "result_set:columns: #{k}=#{v}"
 # convert shortcut to hash 
-      v = {'name' => v} if v.class == String
+    v = {'name' => v} if v.class == String
 # eval
-      value = if v['eval']
-        if v['eval'].match('dc_name4_id')
-          a = v['eval'].split(',')
-          if a.size == 3
-            dc_name4_id(a[1], a[2], nil, document[ v['name'] ])
-          else
-            dc_name4_id(a[1], a[2], a[3], document[ v['name'] ])
-          end
-        elsif v['eval'].match('dc_name4_value')
-          dc_name4_value( @form['table'], v['name'], document[ v['name'] ] )
-        elsif v['eval'].match('eval ')
-# evaluate with specified parameters
+    value = if v['eval']
+      if v['eval'].match('dc_name4_id')
+        a = v['eval'].split(',')
+        if a.size == 3
+          dc_name4_id(a[1], a[2], nil, document[ v['name'] ])
         else
-          if v['params']
-            if v['params'] == 'document'     # pass document as parameter when all
-              eval( "#{v['eval']} document") 
-            else                        # list of fields delimeted by ,
-              params = v['params'].chomp.split(',').inject('') do |result,e| 
-                result << (e.match(/\.|\:|\(/) ? e : "document['#{e.strip}']") + ','
-              end
-              params.chomp!(',')
-              eval( "#{v['eval']} #{params}") 
+          dc_name4_id(a[1], a[2], a[3], document[ v['name'] ])
+        end
+      elsif v['eval'].match('dc_name4_value')
+        dc_name4_value( @form['table'], v['name'], document[ v['name'] ] )
+      elsif v['eval'].match('eval ')
+# evaluate with specified parameters
+      else
+        if v['params']
+          if v['params'] == 'document'     # pass document as parameter when all
+            eval( "#{v['eval']} document") 
+          else                        # list of fields delimeted by ,
+            params = v['params'].chomp.split(',').inject('') do |result,e| 
+              result << (e.match(/\.|\:|\(/) ? e : "document['#{e.strip}']") + ','
             end
-          else
-            eval( "#{v['eval']} '#{document[ v['name'] ]}'") 
+            params.chomp!(',')
+            eval( "#{v['eval']} #{params}") 
           end
+        else
+          eval( "#{v['eval']} '#{document[ v['name'] ]}'") 
         end
+      end
 # as field        
-      elsif document.respond_to?(v['name'])
-        dc_format_value(document.send( v['name'] ), v['format']) 
+    elsif document.respond_to?(v['name'])
+      dc_format_value(document.send( v['name'] ), v['format']) 
 # as hash (dc_dummy)
-      elsif document.class == Hash 
-        document[ v['name'] ]
+    elsif document.class == Hash 
+      document[ v['name'] ]
 # error
-      else
-        "!!! #{v['name']}"
-      end
-#
-      td = '<td '
-      td << dc_style_or_class('class',v['td_class'],value,document)
-      td << dc_style_or_class('style',v['td_style'] || v['style'],value,document)
-      html << "#{td}>#{value}</td>"
+    else
+      "!!! #{v['name']}"
     end
+#
+    td = '<td '
+    td << dc_style_or_class('class',v['td_class'],value,document)
+    td << dc_style_or_class('style',v['td_style'] || v['style'],value,document)
+    html << "#{td}>#{value}</td>"
   end
   html.html_safe
 end
@@ -585,6 +586,19 @@ def dc_actions_for_form()
   c.html_safe
 end
 
+############################################################################
+# Create background div and table definitions for result set.
+############################################################################
+def dc_background_for_result
+  html = '<div class="dc-result-div" ' 
+  html << (@form['result_set']['table_style'] ? "style=\"overflow-x: scroll;\" >" : '>')
+  html << "\n"  
+#
+  html << "<table class=\"dc-result #{@form['result_set']['table_class']}\" "
+  html << (@form['result_set']['table_style'] ? "style=\"#{@form['result_set']['table_style']}\" >" : '>')
+  html.html_safe
+end
+
 ############################################################################
 # Checks if value is defined and sets default. If values are sent it also checks
 # if value is found in values. If not it will report error and set value to default.
@@ -735,7 +749,9 @@ def dc_fields_for_form()
     html << tdata
   end
   # add last_updated_at hidden field so controller can check if record was updated in during editing
-  html << hidden_field(nil, :last_updated_at, :value => @record.updated_at.to_i) if @record.respond_to?(:updated_at)
+  html << hidden_field(nil, :last_updated_at, value: @record.updated_at.to_i) if @record.respond_to?(:updated_at)
+  # add form time stamp to prevent double form submit
+  html << hidden_field(nil, :form_time_stamp, value: Time.now.to_i)
   html.html_safe
 end
 

data/app/helpers/dc_application_helper.rb

@@ -572,6 +572,25 @@ def dc_name4_value(model, field, value)
   ''
 end
 
+############################################################################
+# Return choices for field in model if choices are defined in localization text.
+# 
+# Parameters:
+# [model] String. Table (collection) model name (lowercase).
+# [field] String. Field name used.
+# 
+# Example:
+#    dc_choices4_field('dc_user', 'state' )
+#        
+# Returns: 
+# Array. Choices for select input field
+############################################################################
+def dc_choices4_field(model, field)
+  c = t('helpers.label.' + model + '.choices4_' + field )
+  return ['error'] if c.match( 'translation missing' )
+  c.chomp.split(',').inject([]) {|r,v| r << v.split(':') }
+end
+
 ############################################################################
 # Will return descriptive text for id key when field in one table (collection) has belongs_to 
 # relation to other table.

data/app/models/dc_filter.rb

@@ -58,6 +58,10 @@ def self.get_filter(filter)
 #
   model = yaml['table'].classify.constantize
   field = yaml['field'] == 'id' ? '_id' : yaml['field'] # must be
+# if empty required 
+  if yaml['operation'] == 'empty'
+    return model.in(field => [nil,''])
+  end
 # if value == NIL no filter is necessary
   return nil if yaml['value'].class == String and yaml['value'] == '#NIL'
   
@@ -175,4 +179,19 @@ def self.menu_filter(parent)
   html << '<li id="open_drgcms_filter">' + I18n.t('drgcms.filter_set') + '</li>'
   html << '</ul>'
 end
+
+######################################################################
+# Creates title for turn filter off, which consists of displaying curently
+# active filter and text to turn it off.
+######################################################################
+def self.title4_filter_off(filter_yaml)
+  filter = YAML.load(filter_yaml)
+  operations = I18n.t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) {|r,v| r << v.split(':') }
+  operation = ''
+  operations.each{|a| (operation = a.first; break) if a.last == filter['operation']}
+#
+  '[ ' + I18n.t("helpers.label.#{filter['table']}.#{filter['field']}") + 
+  " ] #{operation} [ #{filter['value'].to_s} ] : #{I18n.t('drgcms.filter_off')}"
+end
+
 end

data/app/models/dc_site.rb

@@ -43,6 +43,7 @@ included do
   field :page_class,          type: String, default: 'DcPage'
   field :site_layout,         type: String, default: 'content'
   field :menu_class,          type: String, default: 'DcSimpleMenu'
+  field :request_processor,   type: String
   field :files_directory,     type: String
   field :logo,                type: String
   field :active,              type: Boolean, default: true

data/app/models/dc_user.rb

@@ -107,6 +107,25 @@ def self.choices4_country()
   @@countries
 end
 
+##########################################################################
+# Performs ligically test on passed email parameter.
+# 
+# Parameters:
+# [email] String: e-mail address
+# 
+# Returns:
+# Boolean: True if parameter is logically valid email address.
+# 
+# Example:
+#    if !DcUser.is_email?(params[:email])
+#      flash[:error] = 'e-Mail address is not valid!'
+#    end
+# 
+##########################################################################
+def self.is_email?(email)
+  email.to_s =~ /^[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/
+end
+
 end
 end
 

data/app/models/drgcms_form_fields.rb

@@ -607,13 +607,27 @@ end
 def ro_standard
   value = @record.respond_to?(@yaml['name']) ? @record[@yaml['name']] : nil
   return self if value.nil?
-#  
-  get_choices.each do |choice|
-    if choice.class == Array
-      return super(choice.first) if choice.last.to_s == value.to_s
-    else
-      return super(choice) if choice.to_s == value.to_s
-    end  
+# 
+  choices = get_choices()
+  if value.class == Array   # multiple choices
+    html = ''
+    value.each do |element|
+      choices.each do |choice|
+        if choice.to_s == element.to_s
+          html << '<br>' if html.size > 0
+          html << "#{element.to_s}"
+        end
+      end       
+    end
+    return super(html)
+  else
+    choices.each do |choice|
+      if choice.class == Array
+        return super(choice.first) if choice.last.to_s == value.to_s
+      else
+        return super(choice) if choice.to_s == value.to_s
+      end 
+    end
   end
   super('')
 end
@@ -624,10 +638,15 @@ end
 def render
   return ro_standard if @readonly
   set_initial_value('html','selected')
- #
+#
   @yaml['html'].symbolize_keys!
-  record = record_text_for(@yaml['name'])  
-  @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'])
+  record = record_text_for(@yaml['name'])
+  if @yaml['multiple']  
+    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], {multiple: true})
+    @js   << "$('##{record}_#{@yaml['name']}').selectMultiple();"
+  else
+    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'])
+  end
   self
 end
 

data/app/views/cmsedit/_result.html.erb

@@ -4,8 +4,7 @@
   <%= dc_table_title_for_result @records %>
 
   <% unless @records.nil? %>
-    <table class="dc-result <%= @form['result_set']['table_class'] %>" 
-           style="<%= @form['result_set']['table_style'] %> ">
+      <%= dc_background_for_result %>
       <tr><%= dc_header_for_result %></tr>
 
       <% for document in @records %>
@@ -16,6 +15,7 @@
       <% end %>
         
     </table>
+  </div>
   <% end %>
   
 </div>

data/config/locales/drgcms_en.yml

@@ -84,7 +84,7 @@ en:
     updated_at: Updated at
     new_record: New record
 
-    choices4_filter_operators: 'Equal to:eq,Contains:like,Greater then:gt,Less then:lt'
+    choices4_filter_operators: 'Equal to:eq,Contains:like,Greater then:gt,Less then:lt,Is empty:empty'
     
     browse_collections: Browse all collections
 

data/config/locales/drgcms_sl.yml

@@ -84,7 +84,7 @@ sl:
     updated_at: Spremenjeno
     new_record: Nov zapis
 
-    choices4_filter_operators: 'Je enak:eq,Vsebuje:like,Je večji od:gt,Je manjši od:lt'
+    choices4_filter_operators: 'Je enak:eq,Vsebuje:like,Je večji od:gt,Je manjši od:lt,Je prazen:empty'
     
     browse_collections: Brskanje po definicijah zbirk
 

data/config/locales/models_en.yml

@@ -60,6 +60,7 @@ en:
         alias_for: Alias for
         rails_view: Rails view
         design: Standard design
+        request_processor: Request processor
 
       dc_design:
         tabletitle: Designs
@@ -523,6 +524,7 @@ en:
         rails_view: Rails view filename used as standard design
         design: Standard design can also be defined at the site level
         dc_parts: Parts contained in site
+        request_processor: Method which will provide output instead of dc_process_default_request 
         
       dc_user:
         username: Username

data/config/locales/models_sl.yml

@@ -50,6 +50,7 @@ sl:
         menu_class: Razred menija
         site_layout: Rails layout
         files_directory: Mapa z datotekami
+        request_processor: Metoda zahtevka
         logo: Logotip
         dc_policies: Politike za dostop
         active: Aktivna
@@ -528,6 +529,7 @@ sl:
         rails_view: Rails view datoteka uporabljena za standard dizajn
         design: Standard dizajn lahko definirate tudi pri spletišču
         dc_parts: Sestavni elementi strani
+        request_processor: Ime ruby metode, ki bo klicana namesto dc_process_default_request 
 
       dc_design:
         name: Unikatno ime za dizajn. Pomembno za iskanje

data/drg_cms.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "History.log", "drg_cms.gemspec"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency 'rails' #, '~> 3.2.16'
+  s.add_dependency 'rails', '~> 4'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
 

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.10"
+  VERSION = "0.5.10.7"
 end

data/lib/generators/new_drg_form/new_drg_form_generator.rb

@@ -15,7 +15,7 @@ def create_form_file
   @model = file_name.classify.constantize rescue nil
   return (p "Model #{file_name.classify} not found! Aborting.") if @model.nil?
 #  
-  yml = top_level_options + index_options + result_set_options + form_top_options + form_fields_options
+  yml = top_level_options + index_options + result_set_options + form_top_options + form_fields_options + localize_options
   create_file "app/forms/#{formname}.yml", yml
 end
 
@@ -153,11 +153,10 @@ def form_field(field, index, offset)
   yml << ' '*offset + "name: #{field}\n"
   yml << ' '*offset + "type: #{type}\n"
   yml << ' '*offset + eval if eval.size > 0
-  yml << ' '*offset + "html:\n"
-  offset += 2
-  if type == 'text_field'
-    yml << ' '*offset + "size: 50\n"
-  else
+  yml << ' '*offset + "size: 50\n" if type == 'text_field'
+  if type == 'select'
+    yml << ' '*offset + "html:\n"
+    offset += 2
     yml << ' '*offset + "include_blank: true\n"
   end 
   yml
@@ -213,5 +212,29 @@ def form_fields_options
   end
   yml
 end
+
+###########################################################################
+#
+###########################################################################
+def localize_options
+  forbidden = ['_id','created_by','updated_by','created_at','updated_at']
+  yml =<<EOT
+  
+#################################################################
+# Localization
+en:
+  helpers:
+    label:
+      #{file_name}:
+        tabletitle: 
+        choices4_ : 
+
+EOT
+  @model.attribute_names.each do |attr_name|
+    next if forbidden.include?(attr_name)
+    yml << "        #{attr_name}: \n"
+  end
+  yml
+end  
     
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.10.7
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -172,12 +172,14 @@ files:
 - app/assets/javascripts/drg_cms/jquery-migrate.js
 - app/assets/javascripts/drg_cms/jquery.bpopup.min.js
 - app/assets/javascripts/drg_cms/jquery.datetimepicker.js
+- app/assets/javascripts/drg_cms/select-multiple.js
 - app/assets/javascripts/drg_cms/some_scripts.js
 - app/assets/javascripts/drg_cms_application.js
 - app/assets/javascripts/drg_cms_cms.js
 - app/assets/stylesheets/drg_cms/drg_cms.css
 - app/assets/stylesheets/drg_cms/jquery-ui.css
 - app/assets/stylesheets/drg_cms/jquery.datetimepicker.css
+- app/assets/stylesheets/drg_cms/select-multiple.css
 - app/assets/stylesheets/drg_cms/th-bg.png
 - app/assets/stylesheets/drg_cms/theme.css
 - app/assets/stylesheets/drg_cms_application.css
@@ -365,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'DRG CMS: Rapid web application development tool for Ruby, Rails and MongoDB'