drg_cms 0.6.1.4 → 0.6.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94829c523218c40d302d4ab63c76c016a540008b878c48e261691f15b54485f7
-  data.tar.gz: ce0c1134fc51e26f4c8439322223e50c071211416a230e674b86f25f81337f06
+  metadata.gz: be7dfed0ede6cbd81a93dbefbd517a2cb3d31151339a1bd3598ebde7e76993e9
+  data.tar.gz: d028640f11c1877e4f6eb4efe44f8fdd9306047678b9d731daeab3e56fb32749
 SHA512:
-  metadata.gz: 45f569c43d27c468a545ed56a15822dee25c27bd3f8811eb28ccb1b388a323420135838b37f9590c3ac98a93d7484db283cf14c767a426d1a812c9597eb9f9c2
-  data.tar.gz: 91838e2e5bec0f8b91cea632e8047cfd53dcd2872de5c5d74b65834b64495498b617bcfee5cac4ae673aed2a8e61b5ceb7025f235a8795b6cc009a5e1fb279d7
+  metadata.gz: 2f5617503a1c85ce1b5bf2a9d3460a33525ba96e20a82a84b85e7adc6f370a576f97b2e76aa57ff424243958046b396e0c4c2a3529a8ba0f763ef43cbe92f450
+  data.tar.gz: 9e716e8fca1ae6330bd74139512fb952d88600ca42d8cd4c5690e8271fb9a50b3e624e72fbcdc7df5ee820a4cd466fc8c6c2b1f5c58b5b9261afb1d076905237

data/app/assets/javascripts/drg_cms/drg_cms.js

@@ -245,9 +245,14 @@ process_json_result = function(json) {
       
 /**** display popup message ****/
       case 'popup':
-      $('#popup').html(value);
-      $('#popup').bPopup({ speed: 650, transition: 'slideUp'});
-      break;
+        if (selector == 'url') {
+          $('#popup').bPopup({ loadUrl: value });
+        }
+        else {
+          $('#popup').html(value);
+          $('#popup').bPopup({speed: 650, transition: 'slideUp', position: ['auto',1]});
+        }
+        break;
 
 /**** update div ****/
     case '#div+':
@@ -273,6 +278,9 @@ process_json_result = function(json) {
     case 'url':
       window.location.href = value;
       break;
+    case 'parenturl':
+      parent.location.href = value;
+      break;
     case 'alert':
       alert(value);
       break;
@@ -574,7 +582,7 @@ $(document).ready( function() {
   $('.iframe_embedded').on('load', function() {
     let embedded_height = this.contentWindow.document.body.offsetHeight;
     // workaround. It gets tricky when embedded field is on tab
-    if (embedded_height == 0) embedded_height = 500;
+    if (embedded_height == 0) embedded_height = 50;
     this.style.height = (embedded_height + 30) + 'px';
     // resize parent iframe window too
     let parentWindow = this.contentWindow.parent;

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -175,14 +175,6 @@ img { vertical-align:bottom; }
   padding: 7px;
 }
 
-/*
-.dc-link a:hover, .dc-animate a:hover, .dc-result a:hover  { 
-  background: #f8f8f8;
-  transition: 0.3s;
-  color: #000;
-}
-*/
-
 a.dc-animate:hover { color: #000; background: transparent;}
 
 .dc-link a img { border: none; }
@@ -208,7 +200,6 @@ width: 99.9%;
 padding:  0;
 border-spacing:  0;
 border-radius: 1px;  
-/*background-color: #f9f9f9;*/
 }
 
 .dc-result i { 
@@ -230,7 +221,6 @@ padding: 0;
 
 .dc-result-header {
   display: flex;
-  /* background: linear-gradient(to bottom, #eee 0%, #e2e2e2 100%); */
 }
 .dc-result-data {
   display: flex;
@@ -255,12 +245,6 @@ padding: 0;
 
 .dc-result-header .spacer, .dc-result-data .spacer {
   width: 2px;
-  /*
-  font-size: 1.5em;
-  margin: 0  0;
-  padding: 4px  0;
-  resize: both;
-/*  border-left: 1px solid #ccc;*/
 }
 
 .dc-result-header a:link, .dc-result-header a:visited {
@@ -335,7 +319,6 @@ padding: 0;
   font-size: 1.2em;
   margin-left: -1rem;
   background-color: white;
-  /* padding: 8px 5px; */
   padding: 6px 3px;
 }
 
@@ -352,12 +335,12 @@ display: inline-table;
 #data-fields {margin: 5px;}
 
 .dc-link {
-font-weight: 600;
-color: #666;
-text-align: center;
-border-radius: 3px;
-background: transparent linear-gradient(to bottom, #fff 0%, #e2e2e2 100%);
-border: 1px solid #ddd;
+  font-weight: 600;
+  color: #666;
+  text-align: center;
+  border-radius: 3px;
+  background: transparent linear-gradient(to bottom, #fff 0%, #e2e2e2 100%);
+  border: 1px solid #eee;
 }
 
 .dc-link:hover {
@@ -382,13 +365,17 @@ border: 1px solid #ddd;
   font-weight: 600;
   padding: 7px;
   vertical-align: bottom;
-  border: 1px solid #ccc;
+  border: 1px solid #eee;
   border-radius: 3px;
   color: #777;
   text-shadow: 1px 1px #fff;
   background: #ddd !important;
 }
 
+.dc-action-menu li.dc-link.plus-link {
+  padding: 7px 0;
+}
+
 .dc-link-ajax {
   text-align: left;
   font-weight: 600;
@@ -396,7 +383,7 @@ border: 1px solid #ddd;
   border-radius: 3px;
   color: #666;
   background: transparent linear-gradient(to bottom, #fff 0%, #e2e2e2 100%) repeat scroll 0% 0%;
-  border: 1px solid #ddd;
+  border: 1px solid #eee;
 }
 
 .dc-link-ajax.with-link {padding: 7px}
@@ -407,20 +394,19 @@ border: 1px solid #ddd;
 }
 
 .dc-link-ajax:hover, .dc-action-submit:hover {
-cursor: pointer;
-background: #eee;
-border: 1px solid #bbb;
+  cursor: pointer;
+  color: #000;
+  background: #eee;
   border: 1px solid rgba(76,154,255, 1);
   box-shadow: inset 0 0 0 1px rgba(76,154,255, 1);
-transition: 0.3s; 
-color: #000;
+  transition: 0.3s;
 }
 
 .dc-link-ajax:hover a { 
-color: #000; 
-background: transparent;
-cursor: pointer; 
-transition: 0.3s; 
+  color: #000;
+  background: transparent;
+  cursor: pointer;
+  transition: 0.3s;
 }
 
 .dc-link-img {
@@ -494,16 +480,12 @@ border: solid 1px #ccc;;
 }
 .dc-link-submit {
   text-align: left;
-  padding: 1px 8px 0.5px; 
-/* Exo  padding: 0 8px; */
-  
   border-radius: 3px;
   background-color: #eee;
   background: transparent linear-gradient(to bottom, #fff 0%, #e2e2e2 100%) repeat scroll 0% 0%;
-  border: 1px solid #ddd;
+  border: 1px solid #eee;
   display: flex;
   align-items: center;
-  
 }
 
 .dc-link-submit .fa {
@@ -529,7 +511,7 @@ border: solid 1px #ccc;;
   border: none;
   color: #666;
   font-weight: 600;
-  padding: 1px 2px 0;
+  padding: 2px 8px 1px;
   border-radius:  0;
   background: transparent;
   line-height: 30px;
@@ -638,7 +620,7 @@ color: #aaa;
 
 .dc-form-info {
   padding: 8px;
-  background-image: linear-gradient(to bottom, #dff0d8 0px, #c8e5bc 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);
   background-repeat: repeat-x;
   color: darkgreen;  
   border: 1px solid #b2dba1;  
@@ -648,19 +630,17 @@ color: #aaa;
 
 .dc-form-warning {
   padding: 8px;
-  background-image: linear-gradient(to bottom, #fcf8e3 0px, #f8efc0 100%);
+  background-image: linear-gradient(to bottom, rgba(213, 143, 218, 0.1) 0, rgba(213, 143, 218, 0.5) 100%);
   background-repeat: repeat-x;
-  color: #c84;  
-  border: 1px solid #f5e79e;  
+  color: rgba(102, 51, 153, 1);
+  border: 1px solid rgba(102, 51, 153, 0.3);
   border-radius: 2px;
   margin: 2px 0;
 }
 
 .dc-form-error {
   padding: 8px;
-  background-image: linear-gradient(to bottom, #f2dede 0px, #e7c3c3 100%);
-  background-repeat: repeat-x;
-  background-color: #f2dede;
+  background-image: linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);
   color: #a94442;
   border: 1px solid #dca7a7;
   border-radius: 2px;
@@ -771,7 +751,7 @@ margin-bottom: -3px;
   line-height: 1.2em;
   padding: 0.4em 1em;
   background: #666;
-  margin: 0 1px 1px 0;
+  margin: 0 1px 0 0;
   border-left: 1px solid #ddd;
   border-right: 1px solid #ddd;
   border-radius: 4px 4px 0  0;
@@ -1524,6 +1504,6 @@ color: #669;
 /******* Firefox only ********/
 @-moz-document url-prefix() {
   .dc-submit {
-    padding: 0 2px 1px;
+    /* padding: 0 2px 1px; */
   }
 }

data/app/controllers/cmsedit_controller.rb

@@ -41,9 +41,10 @@
 # its control's would be found in model_embedded_controls.rb. By convention module names
 # are declared in camel case, so our dc_page_controls.rb declares DrgcmsControls::DcPageControls module.
 # 
-# Controls (among other) may contain 6 fixed callback methods.
+# Controls (among other) may contain 7 callback methods.
 # These methods are:
 # * dc_new_record
+# * dc_dup_record
 # * dc_before_edit
 # * dc_before_save
 # * dc_after_save
@@ -67,7 +68,7 @@
 #      if dc_user_can(DcPermission::CAN_READ)
 #        dc_page.where(created_by: session[:user_id])
 #      else
-#        flash[:error] = 'You can not perform this operation!'
+#        flash[:error] = 'User can not perform this operation!'
 #        nil
 #      end
 #    end
@@ -76,7 +77,6 @@
 ########################################################################
 class CmseditController < DcApplicationController
 before_action :check_authorization, :except => [:login, :logout, :test, :run]
-before_action :dc_reload_patches if Rails.env.development?
 protect_from_forgery with: :null_session, only: Proc.new { |c| c.request.format.json? }
   
 layout 'cms'
@@ -234,6 +234,7 @@ end
 # duplicating document and is subroutine of create action.
 ########################################################################
 def duplicate_document(source)
+  params['dup_fields'] += ',' if params['dup_fields'] # for easier field matching
   dest = {}
   source.attribute_names.each do |attribute_name|
     next if attribute_name == '_id' # don't duplicate _id
@@ -294,12 +295,11 @@ def create
     end
   else # duplicate record
     find_record
-    params['dup_fields'] += ',' if params['dup_fields'] # for easier field matching
     new_doc = duplicate_document(@record)
     create_new_empty_record(new_doc)
-    update_standards()
+    if (m = callback_method('dup_record')) then call_callback_method(m) end
+    update_standards
     @record.save!
-
     index
   end
 end
@@ -331,10 +331,8 @@ def update
     end
   end
 
-  if dc_user_can(DcPermission::CAN_EDIT_ALL) or
-    ( @record.respond_to?('created_by') and
-      @record.created_by == session[:user_id] and
-      dc_user_can(DcPermission::CAN_EDIT) )
+  if dc_user_can(DcPermission::CAN_EDIT_ALL) ||
+    (@record.respond_to?('created_by') && @record.created_by == session[:user_id] && dc_user_can(DcPermission::CAN_EDIT))
 
     if save_data
       params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
@@ -688,7 +686,7 @@ def create_new_empty_record(initial_data = nil) #:nodoc:
     @record = @tables.first[0].new(initial_data)
   else
     rec = @tables.first[0].find(@ids.first)             # top most record
-    1.upto(@tables.size - 2) { |i| rec = rec.send(@tables[i][1].pluralize).find(@ids[i]) }  # find embedded childrens by ids
+    1.upto(@tables.size - 2) { |i| rec = rec.send(@tables[i][1].pluralize).find(@ids[i]) }  # find embedded children by ids
     @record = rec.send(@tables.last[1].pluralize).new(initial_data)   # new record
   end
 end
@@ -715,8 +713,9 @@ end
 ########################################################################
 def save_journal(operation, changes = {})
   if operation == :delete
-    @record.attributes.each {|k,v| changes[k] = v}
+    @record.attributes.each { |k, v| changes[k] = v }
   end
+  changes.except!('created_at', 'updated_at', 'created_by', 'updated_by')
 
   if (operation != :update) || changes.size > 0
     # determine site_id
@@ -740,7 +739,7 @@ end
 # Returns callback method name or nil if not defined.
 ########################################################################
 def callback_method(key) #:nodoc:
-  data_key = key.gsub('_','-') # convert _ to -
+  data_key = key.gsub('_', '-') # convert _ to -
   callback = case
     when params['data'] && params['data'][data_key] then params['data'][data_key]
     # dc_ + key method is present then call it automatically
@@ -842,7 +841,7 @@ def save_data
   update_standards() if changes.size > 0  # update only if there has been some changes
   if (saved = @record.save)
     operation = @record.new_record? ? :new : :update
-    save_journal(operation, changes)
+    save_journal(operation, @record.previous_changes)
     # after_save callback
     if (m = callback_method('after_save') ) then call_callback_method(m) end
   end
@@ -1006,30 +1005,34 @@ end
 # Process index action for normal collections.
 ########################################################################
 def process_collections #:nodoc
-# If result_set is not defined on form, then it will fail. :return_to should know where to go
+  # If result_set is not defined on form, then it will fail. :return_to should know where to go
   if @form['result_set'].nil?
-    process_return_to(params[:return_to] || 'reload') 
+    process_return_to(params[:return_to] || 'reload')
     return true
   end
-# for now enable only filtering of top level documents
+  # when result set is evaluated as Rails helper
+  @form['result_set']['type'] ||= 'default'
+  return unless @form['result_set']['type'] == 'default'
+
+  # for now enable only filtering of top level documents
   if @tables.size == 1 
     check_filter_options()
     check_sort_options()
   end  
-# result set is defined by filter method in control object
+  # result set is defined by filter method in control object
   form_filter = @form['result_set']['filter']
   if form_filter
     if respond_to?(form_filter)
       @records = send(form_filter)
-# something went wrong. flash[] should have explanation.
+      # something went wrong. flash[] should have explanation.
       if @records.class == FalseClass
         @records = []
         render(action: :index)
         return true
       end
       process_select_and_deny_fields           
-# pagination but only if not already set
-      unless (@form['table'] == 'dc_memory' or @records.options[:limit])
+      # pagination but only if not already set
+      unless (@form['table'] == 'dc_memory' || @records.options[:limit])
         per_page = (@form['result_set']['per_page'] || 30).to_i
         @records = @records.page(params[:page]).per(per_page) if per_page > 0
       end
@@ -1040,10 +1043,10 @@ def process_collections #:nodoc
     if @tables.size > 1 
       rec = @tables.first[0].find(@ids.first)          # top most document.id
       1.upto(@tables.size - 2) { |i| rec = rec.send(@tables[i][1].pluralize).find(@ids[i]) }  # find embedded childrens by ids
-# TO DO. When field name is different then pluralized class name. Not working yet.
+      # TO DO. When field name is different then pluralized class name. Not working yet.
       embedded_field_name = @tables.last[0] ? @tables.last[1].pluralize : @tables.last[1]
       @records = rec.send(embedded_field_name)   # current embedded set
-# sort by order if order field is present in model
+      # sort by order if order field is present in model
       if @tables.last[1].classify.constantize.respond_to?(:order)
         @records = @records.order_by('order asc')
       end

data/app/controllers/dc_application_controller.rb

@@ -28,7 +28,8 @@
 class DcApplicationController < ActionController::Base
 protect_from_forgery with: :null_session, only: Proc.new { |c| c.request.format.json? }
 before_action :dc_reload_patches if Rails.env.development?
-  
+before_action :dc_set_locale
+
 ########################################################################
 # Writes anything passed as parameter to logger file. 
 # Very useful for debuging strange errors.
@@ -578,6 +579,20 @@ def dc_reload_patches
   end
 end
 
+########################################################################
+# Will set new default locale for application
+#
+# @param [String] new_locale : New locale value. If omitted it will be provided from params[:locale].
+#  if new_locale value is 00, application's default_locale will be used.
+########################################################################
+def dc_set_locale(new_locale = nil)
+  new_locale ||= params[:locale]
+  if new_locale && new_locale != session[:locale]
+    session[:locale] = new_locale == '00' ? nil : new_locale.to_sym
+  end
+  I18n.locale = session[:locale] ? session[:locale] : I18n.default_locale
+end
+
 ############################################################################
 # Writes out deprication msg. It also adds site_name to message, so it is easier to
 # find where the message is comming from.

data/app/controllers/dc_common_controller.rb

@@ -49,7 +49,12 @@ def autocomplete
     name = params['search'].split('.').first
     params['table'] = name.underscore
   end
-  return render plain: t('drgcms.not_authorized') unless dc_user_can(DcPermission::CAN_VIEW)
+  if params['table'].match('_control')
+    # it must be at least logged on
+    return render json: { label: t('drgcms.not_authorized') } unless dc_user_can(DcPermission::CAN_VIEW, 'dc_memory')
+  else
+    return render json: { label: t('drgcms.not_authorized') } unless dc_user_can(DcPermission::CAN_VIEW)
+  end
 
   table = params['table'].classify.constantize
   input = params['input'].gsub(/\(|\)|\[|\]|\{|\|\.|\,}/, '')
@@ -69,7 +74,7 @@ def autocomplete
         end
       end
 
-  render plain: a.to_json
+  render json: a
 end
 
 ########################################################################

data/app/controls/dc_help_control.rb

@@ -116,6 +116,18 @@ def self.choices_for_form_name(session)
   Dir["#{session[:help_project]}/*.yml"].map { |file_name| File.basename(file_name,'.*') }.sort
 end
 
+######################################################################
+# Will return choices for language select on form. Choices can be either set by dc_locales document in dc_big_table
+# or can be acquired from Rails default locale
+######################################################################
+def self.choices_for_locales
+  choices = DcBigTable.choices4('dc_locales')
+  return choices unless choices[0,0] == I18n.t('drgcms.error')
+
+  choices = [I18n.default_locale] + I18n.fallbacks.inject([]) { |r, e| r << e.first }
+  choices.map(&:to_s).uniq
+end
+
 ######################################################################
 # Will return temp key for data saved in dc_temp file
 ######################################################################

data/app/forms/dc_big_table.yml

@@ -59,5 +59,3 @@ form:
       name: dc_big_table_values
       type: embedded
       form_name: dc_big_table_value
-      html:
-        height: 600      

data/app/forms/dc_big_table_value.yml

@@ -48,5 +48,3 @@ form:
       name: dc_big_table_locales
       type: embedded
       form_name: dc_big_table_locale
-      html:
-        height: 300      

data/app/forms/dc_design.yml

@@ -79,5 +79,4 @@ form:
         type: embedded
         caption: false
         form_name: dc_part
-        html:
-          height: 1000
+        load: delay

data/app/forms/dc_folder_permission.yml

@@ -46,5 +46,3 @@ form:
       type: embedded
       table: dc_policy_rule
       form_name: dc_policy_rule_nocms
-      html:
-        height: 400

data/app/forms/dc_help_1.yml

@@ -20,8 +20,9 @@ index:
       type: field
       name: lang_1
       caption: drgcms.dc_help.lang
-      field_type: text_field
+      field_type: text_with_select
       size: 5
+      eval: DcHelpControl.choices_for_locales
       default:
         eval: '@parent.session[:help_lang]'
       html:

data/app/forms/dc_json_ld.yml

@@ -54,6 +54,3 @@ form:
       name: dc_json_lds
       type: embedded
       table: dc_json_ld
-      html:
-        height: 400
-      

data/app/forms/dc_menu.yml

@@ -32,25 +32,21 @@ form:
       10:
         name: name
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       20:
         name: description
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       30:
         name: div_name
         type: text_field
-        html:
-          size: 20
+        size: 20
       40:
         name: link_prepend
         type: text_field
-        html:
-          size: 20
+        size: 20
       50:
         name: dc_site_id
         type: select
@@ -64,13 +60,11 @@ form:
         type: embedded
         caption: false
         form_name: dc_menu_item
-        html:
-          height: 1000
+        load: delay
 
     tab3:
       20:
         name: css
         caption: false
         type: text_area
-        html:
-          size: 100x50
+        size: 100x50

data/app/forms/dc_menu_item.yml

@@ -75,7 +75,5 @@ form:
         type: embedded
         caption: false
         form_name: dc_menu_item
-        html:
-          height: 1000
-
+        load: delay
   

data/app/forms/dc_page.yml

@@ -157,8 +157,7 @@ form:
         caption: false
         type: embedded
         form_name: dc_part
-        html:
-          height: 600
+        load: delay
           
     5iframe:
       10:

data/app/forms/dc_policy.yml

@@ -40,8 +40,7 @@ form:
     40:
       name: message
       type: text_area
-      html:
-        size: 100x5
+      size: 100x5
 
     50:
       name: active
@@ -51,6 +50,4 @@ form:
       name: dc_policy_rules
       type: embedded
       form_name: dc_policy_rule
-      html:
-        height: 400
-        
+

data/app/forms/dc_poll.yml

@@ -37,14 +37,12 @@ form:
       10:
         name: name
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       20:
         name: title
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       30:
         name: sub_text
@@ -54,8 +52,7 @@ form:
       35:
         name: pre_display
         type: text_field
-        html:
-          size: 50
+        size: 50
       40:
         name: operation
         type: select
@@ -63,8 +60,7 @@ form:
       50:
         name: parameters
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       60:
         name: display
@@ -73,8 +69,7 @@ form:
       70:
         name: captcha_type
         type: text_field
-        html:
-          size: 10
+        size: 10
 
       80:
         name: valid_from
@@ -92,8 +87,7 @@ form:
       100:
         name: css
         type: text_area
-        html:
-          size: 100x20
+        size: 100x20
 
       110:
         name: active
@@ -103,8 +97,8 @@ form:
         name: js
         type: text_area
         caption: false
+        size: 100x50
         html:
-          size: 100x50
           style: 'font-family:courier;'
     tab3:
       20:
@@ -112,13 +106,13 @@ form:
         caption: false
         type: embedded
         form_name: dc_poll_item
-        html:
-          height: 800      
+        load: delay
+
     tab4:
       10:
         name: form
         caption: false
         type: text_area
+        size: 100x50
         html:
-          size: 100x50
           style: 'font-family:courier;'

data/app/forms/dc_seo.yml

@@ -29,5 +29,4 @@ form:
         help: helpers.help.dc_seo.dc_json_lds
         type: embedded
         table: dc_json_ld
-        html:
-          height: 600
+        load: delay

data/app/forms/dc_simple_menu.yml

@@ -63,8 +63,7 @@ form:
         type: embedded
         caption: false
         form_name: dc_simple_menu_item
-        html:
-          height: 800
+        load: delay
 
     tab3:
       20:

data/app/forms/dc_site.yml

@@ -132,8 +132,7 @@ form:
         type: text_area
         size: 130x40
 
-    5permissions:        
-
+    5permissions:
       10:
         name: inherit_policy
         type: select
@@ -145,6 +144,8 @@ form:
         type: embedded
         caption: false
         form_name: dc_policy
+        load: delay
+
     6parts:
       10:
         name: dc_parts

data/app/helpers/cms_common_helper.rb

@@ -345,7 +345,7 @@ def dc_help_for_tab(tab)
     label, help = dc_label_help(field.last)
     next if help.blank?
 
-    html << %(<div class="help-field"><div class="help-label">#{label}</div><div class="help-text">#{help}</div></div>)
+    html << %(<div class="help-field"><div class="help-label">#{label}</div><div class="help-text">#{help.gsub("\n",'<br>')}</div></div>)
   end
   html
 end

data/app/helpers/cms_edit_helper.rb

@@ -138,10 +138,10 @@ def dc_actions_for_form(position)
   actions = actions.to_a.sort { |x, y| x[0] <=> y[0] }
   # Add spinner to the beginning
   html = %Q[<span class="dc-spinner">#{fa_icon('spinner lg spin')}</span><ul class="dc-menu #{position}">]
-  
+
   actions.each do |key, options|
     session[:form_processing] = "form:actions: #{key} #{options}"
-    next if options.nil?  # yes it happends
+    next if options.nil?  # yes it happens
     parms = @parms.clone
     if options.class == String
       next if @form['readonly'] and !options.match(/back|close/)
@@ -307,13 +307,13 @@ def dc_fields_for_tab(fields_on_tab) #:nodoc:
       group_count  = options['group'] || 1 
       group_option = options['group'] || 1 
     end
-    #    
+
     html << if labels_pos == 'top'
-%Q[
+%(
 <div class="dc-form-label-top dc-color-#{odd_even} dc-align-left" title="#{help}">
   <label for="record_#{options['name']}">#{label} </label>
   <div id="td_record_#{options['name']}">#{field_html}</div>
-</div> ]
+</div> )
     else
       # no label
       if dc_dont?(options['caption'])
@@ -326,13 +326,14 @@ def dc_fields_for_tab(fields_on_tab) #:nodoc:
       else
         label_width = 14
         data_width  = 85      
-      end      
-%Q[
+      end
+      help.gsub!('<br>',"\n") if help.present?
+%(
 <div class="dc-form-label dc-color-#{odd_even} dc-align-#{labels_pos} dc-width-#{label_width}" title="#{help}">
   <label for="record_#{options['name']}">#{label} </label>
 </div>
 <div id="td_record_#{options['name']}" class="dc-form-field dc-color-#{odd_even} dc-width-#{data_width}">#{field_html}</div>
-]
+)
     end
     # check if group end
     if (group_count -= 1) == 0

data/app/helpers/cms_helper.rb

@@ -37,7 +37,7 @@ def dc_script_action(yaml)
 #  data = {'request' => 'script', 'script' => yaml['js'] || yaml['script'] }
 #  %Q[<li class="dc-link-ajax with-link dc-animate">#{ dc_link_to(yaml['caption'], yaml['icon'], '#', data: data ) }</li>]
   icon = dc_icon_for_link yaml['icon']
-  data = %Q[data-request="script" data-script="#{yaml['js'] || yaml['script']}"]
+  data = %(data-request="script" data-script="#{yaml['js'] || yaml['script']}" data-url="script")
   %Q[<li class="dc-link-ajax dc-animate" #{data}>#{icon} #{ t(yaml['caption'],yaml['caption']) }</li>]
 end
 
@@ -182,7 +182,7 @@ end
 # Returns:
 #   String : HTML code for action
 ############################################################################
-def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
+def dc_link_ajax_window_submit_action(yaml, record = nil, action_active = true)
   parms = {}
   caption = yaml['caption'] || yaml['text']
   caption = caption ? t("#{caption.downcase}", caption) : nil
@@ -241,7 +241,7 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
          data-request="#{request}" title="#{yaml['title']}">#{icon}#{caption}</li>]
 
     elsif yaml['type'] == 'link'  # link button
-      clas = "dc-link dc-animate"
+      clas = "dc-link plus-link dc-animate"
       link = dc_link_to(caption, yaml['icon'], parms, yaml['html'] )
       %Q[<li class="#{clas}">#{action_active ? link : caption}</li>]
 

data/app/helpers/cms_index_helper.rb

@@ -84,7 +84,6 @@ def dc_actions_for_index
     # html link options
     yhtml = yaml['html'] || {}
     yhtml['title'] = yaml['title'] if yaml['title']
-
     code = case
     # sort
     when action == 'sort' then 
@@ -113,9 +112,14 @@ def dc_actions_for_index
       caption
 
     # new
-    when action == 'new' then 
+    when action == 'new' then
       caption = yaml['caption'] || 'drgcms.new'
-      dc_link_to(caption,'plus', url, yhtml )
+      html << "<li class=\"dc-link plus-link dc-animate\">#{dc_link_to(caption, 'plus', url, yhtml )}</li>"
+      next
+
+    when action == 'close' then
+      html << %(<li class="dc-link dc-animate" onclick="window.close();"'>#{fa_icon('close')} #{t('drgcms.close')}</li>)
+      next
 
     # menu
     when action == 'menu' then
@@ -598,4 +602,16 @@ def dc_define_standard_actions(actions_params, standard)
   actions
 end
 
+############################################################################
+# When result set is to be drawn by Rails helper method.
+############################################################################
+def dc_process_result_set_method
+  method = @form['result_set']['eval']
+  if respond_to?(method)
+    send method
+  else
+    I18n.t('drgcms.no_method', method: method)
+  end
+end
+
 end

data/app/helpers/dc_application_helper.rb

@@ -288,7 +288,7 @@ def dc_edit_title
   else
     # concatenate title
     c = (@form['readonly'] ? t('drgcms.show') : t('drgcms.edit')) + " : "
-    c << (@form['title'] ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
+    c << (@form['title'].class == String ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
     title = (title and title['field']) ? title['field'] : @form['form']['edit_title']
     dc_deprecate('form:edit_title will be deprecated. Use form:title:field instead.') if @form['form']['edit_title']
 
@@ -456,19 +456,47 @@ end
 def dc_error_messages_for(doc)
   return '' unless doc && doc.errors.any?
 
-  msgs = ''
-  doc.errors.each do |error|
+  msgs = doc.errors.inject('') do |r, error|
     label = t("helpers.label.#{decamelize_type(doc.class)}.#{error.attribute}", error.attribute)
-    msgs << "<li>#{label} : #{error.message}</li>"
+    r << "<li>#{label} : #{error.message}</li>"
   end
-  
-c = <<eot
+
+  html = <<eot
 <div class="dc-form-error"> 
   <h2>#{t('drgcms.errors_no')} #{doc.errors.size}</h2>  
   <ul>#{msgs}</ul>  
 </div>
 eot
-  c.html_safe
+  html.html_safe
+end
+
+####################################################################
+# Returns warning messages if any set in a model.
+#
+# When warnings array is added to model its content can be written on top of the form.
+#
+# Parameters:
+# [doc] Document. Document record which will be checked for errors.
+#
+# Returns:
+# String. HTML code formatted for display.
+####################################################################
+def dc_warning_messages_for(doc)
+  return ''
+  return '' unless doc && doc.respond_to?(:warnings)
+
+  msgs = doc.warnings.inject('') do |r, error|
+    label = t("helpers.label.#{decamelize_type(doc.class)}.#{error.attribute}", error.attribute)
+    msgs << "<li>#{label} : #{error.message}</li>"
+  end
+
+  html = <<eot
+<div class="dc-form-warning"> 
+  <h2>#{t('drgcms.warnings_no')} #{doc.warnings.size}</h2>  
+  <ul>#{msgs}</ul>  
+</div>
+eot
+  html.html_safe
 end
 
 ####################################################################

data/app/models/dc_big_table.rb

@@ -78,10 +78,10 @@ class DcBigTable
 ########################################################################
 # Will return possible choices for specified key prepared for usega in select input field.
 ########################################################################
-def self.choices4(key, site, locale=nil)
+def self.choices4(key, site = nil, locale = nil)
   result = []
   choices = find_by(key: key, site: site)
-  choices = find_by(key: key, site: nil) if choices.nil?
+  choices = find_by(key: key, site: nil) if site && choices.nil?
   if choices
     choices.dc_big_table_values.each do |choice| 
       description = choice.description

data/app/models/dc_filter.rb

@@ -119,7 +119,7 @@ def self.get_filter_field(parent)
   return '' if field.nil? && filter['input'].nil?
 
   saved_readonly = parent.form['readonly']
-  parent.form['readonly'] = nil # must be
+  parent.form['readonly'] = false # must be
   field ||= {}
   # If field has choices available in labels, use them. This is most likely select input field.
   if field['name']
@@ -146,24 +146,24 @@ def self.get_filter_field(parent)
   # remove if present
   field['with_new'] = nil if field['with_new']
   # create input field object
-  klas_string = field['type'].camelize
-  klas = DrgcmsFormFields::const_get(klas_string) rescue nil
-  parent.form['readonly'] = saved_readonly
-  return '' if klas.nil?
-
+  html = ''
+  klass_string = field['type'].camelize
+  klass = DrgcmsFormFields::const_get(klass_string) rescue nil
   # return data from object and create html code to display field
-  object = klas.new(parent, nil, field).render rescue nil
-  # Error. Forget filter and return 
-  if object.nil?
-    parent.session[ parent.form['table'] ][:filter] = nil
-    return ''
+  if klass
+    if drg_field = klass.new(parent, nil, field).render rescue nil
+      js = drg_field.js.blank? ? '' : parent.javascript_tag(drg_field.js)
+      html = %(<li class="no-background">
+<span class="filter_field" data-url="#{url}">#{drg_field.html}
+  #{parent.fa_icon('search lg', class: 'record_filter_field_icon')}
+  #{js}</span></li>)
+    else
+      # Error. Forget filter
+      parent.session[ parent.form['table'] ][:filter] = nil
+    end
   end
-  js = object.js.blank? ? '' : parent.javascript_tag(object.js)
-%(<li class="no-background">
-<span class="filter_field" data-url="#{url}">#{object.html}
-#{parent.fa_icon('search lg', class: 'record_filter_field_icon')}
-#{js}</span>
-</li>)
+  parent.form['readonly'] = saved_readonly
+  html
 end
 
 ######################################################################

data/app/models/dc_temp.rb

@@ -137,4 +137,11 @@ def self.prepare(key:, clear: nil)
   self.where(key: key) 
 end
 
+########################################################################
+# Order data by new key. Will update order field with values from new field
+########################################################################
+def self.reorder_by(key, new_order)
+  self.where(key: key).each { |doc| doc.order = data[key]; doc.save }
+end
+
 end

data/app/models/drgcms_form_fields/comment.rb

@@ -31,12 +31,17 @@ module DrgcmsFormFields
 # * +type:+ comment (required)
 # * +caption:+ Caption text written in label place. If set to false comment 
 # will occupy whole row. (required)
-# 
+# * +html:+ Optional html attributes will be added to div surrounding the comment.
+#
 # Form example:
 #    30:
 #      type: comment
 #      text: myapp.comment_text
 #      caption: false
+#      html:
+#        style: 'color: red'
+#        class: some_class
+#        id: some_id
 ###########################################################################
 class Comment < DrgcmsField
   
@@ -45,7 +50,11 @@ class Comment < DrgcmsField
 ###########################################################################
 def render
   comment = @yaml['comment'] || @yaml['text']
-  @html << "<div class=\"dc-comment\">#{t(comment, comment).gsub("\n",'<br>')}</div>"
+  @yaml['html'] ||= {}
+  @yaml['html']['class'] = 'dc-comment ' + @yaml['html']['class'].to_s
+  html = @yaml['html'].inject('') { |r, e| r << %( #{e[0]}="#{e[1]}") }
+
+  @html << %(<div #{html}>#{t(comment, comment).gsub("\n",'<br>')}</div>)
   self
 end
 end

data/app/models/drgcms_form_fields/select.rb

@@ -144,8 +144,7 @@ end
 def add_view_code
   return '' if (data = @record.send(@yaml['name'])).blank?
 
-  ar = @yaml['view'].split(/\ |\,/).delete_if {|e| e.blank?}
-  table, form_name = *ar
+  table, form_name = @yaml['view'].split(/\ |\,/).delete_if { |e| e.blank? }
   url  = @parent.url_for(controller: :cmsedit, id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
   icon = @parent.fa_icon('eye')
   %(<span class="dc-window-open" data-url="#{url}">#{icon}</span>)
@@ -158,9 +157,9 @@ def ro_standard
   value = @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
   return self if value.blank?
 
+  html = ''
   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
@@ -169,17 +168,17 @@ def ro_standard
         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
+        (html = choice.first; break) if choice.last.to_s == value.to_s
       else
-        return super(choice) if choice.to_s == value.to_s
+        (html = choice; break) if choice.to_s == value.to_s
       end 
     end
+    html << add_view_code if @yaml['view']
   end
-  super('')
+  super(html)
 end
 
 ###########################################################################

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

@@ -1,6 +1,7 @@
 
-<%= dc_flash_messages %> 
-<%= dc_error_messages_for @record %> 
+<%= dc_flash_messages %>
+<%= dc_error_messages_for @record %>
+<%= dc_warning_messages_for @record %>
 
 <div class="dc-form-frame">
 

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

@@ -1,24 +1,27 @@
 
 <div class="dc-table-frame">
 
-  <% unless @records.nil? %>
-      <%= dc_background_for_result(:start) %>
-  
-      <%= dc_header_for_result %>
-      <% for document in @records %>
-        <%= dc_row_for_result(document) %>
-        <%= dc_actions_for_result(document) %>
-        <%= dc_columns_for_result(document) %>
-        </div>
-      <% end %>
-      <% if @record_footer %>
-        <div class="dc-result-data footer">
-        <%= dc_actions_column_for_footer() %>
-        <%= dc_columns_for_result(@record_footer) %>
-        </div>
-      <% end %>
-        
-      <%= dc_background_for_result(:end) %>
+  <% if @form['result_set']['type'] == 'method' %>
+    <%= dc_process_result_set_method %>
+  <% elsif @records %>
+    <%= dc_background_for_result(:start) %>
+    <%= dc_header_for_result %>
+
+    <% for document in @records %>
+      <%= dc_row_for_result(document) %>
+      <%= dc_actions_for_result(document) %>
+      <%= dc_columns_for_result(document) %>
+      </div>
+    <% end %>
+
+    <% if @record_footer %>
+      <div class="dc-result-data footer">
+      <%= dc_actions_column_for_footer() %>
+      <%= dc_columns_for_result(@record_footer) %>
+      </div>
+    <% end %>
+
+    <%= dc_background_for_result(:end) %>
   <% end %>
   <%= dc_filter_popup() %>
   

data/config/locales/drgcms_en.yml

@@ -60,9 +60,10 @@ en:
     login: Login into CMS
     username: User name
     password: Password
-    form_error: Error loading form #{form_name}
+    form_error: Error loading form %{form_name}
     img_large: Click for larger image
-    no_class: Class %{class} not defined!
+    no_class: Class [%{class}] not defined!
+    no_method: Method (helper) [%{method}] not defined!
     img_alt_not_present: All images in body must have alternative text entered
     
     toggle_cms: Toggle CMS edit/view mode

data/config/locales/drgcms_sl.yml

@@ -60,9 +60,10 @@ sl:
     login: Prijava v CMS
     username: Uporabnik
     password: Geslo
-    form_error: Napaka pri branju forme #{form_name}
+    form_error: Napaka pri branju forme %{form_name}
     img_large: Klik za večjo sliko
-    no_class: Class %{class} ni definiran!
+    no_class: Razred (class) [%{class}] ni definiran!
+    no_method: Metoda (helper) [%{method}] ne obstaja!
     img_alt_not_present: Vse slike v vsebini morajo imeti vpisano nadomestno besedilo    
 
     toggle_cms: Preklopi med CMS urejanjem in prikazom

data/config/locales/models_sl.yml

@@ -984,3 +984,4 @@ sl:
         active: Podatki so aktivni
         add_schema: Dodaj strukturo
         add_error: Element %{schema} že obstaja!
+

data/lib/drg_cms/version.rb

@@ -23,5 +23,5 @@
 
 # drg_cms gem version
 module DrgCms #:nodoc:
-  VERSION = '0.6.1.4'.freeze
+  VERSION = '0.6.1.5'.freeze
 end

data/lib/drg_cms.rb

@@ -140,12 +140,8 @@ end
 def self.model_check(document, crash = false)
   return nil unless document.errors.any?
 
-  msg = ""
-  document.errors.each do |attribute, errors_array|
-    msg << "#{attribute}: #{errors_array}\n"
-  end
-  #
-  if crash and msg.size > 0
+  msg = document.errors.inject('') { |r, error| r << "#{error.attribute}: #{error.message}\n" }
+  if crash && msg.size > 0
     msg = "Validation errors in #{document.class}:\n" + msg
     pp msg
     Rails.logger.error(msg)
@@ -245,5 +241,3 @@ def self.routes
 end
 
 end
-
-DrgCms.add_patches_path(File.dirname(__FILE__) + '../app/models/drgcms_form_fields/patches')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.4
+  version: 0.6.1.5
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails