drg_cms 0.7.0.8 → 0.7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2d3e3ad52492c5dccf2b91cd7c9c1ea203b7a60c21b0e3d4f7947a3b298bd8b
-  data.tar.gz: a9b23d36c053d8770a661827a211e88172ccadf10eb0c0f17419e0069799f402
+  metadata.gz: 836e52abeb4f9f04c54c21d66c4c053b5bc9cb8906904ce6c608b0c03edc57d7
+  data.tar.gz: 86469fb38b082d39f20ce81ee903354e11d693db34060a224cf031facd554b45
 SHA512:
-  metadata.gz: f745ccb1e0902369746c51da513b1487eca95b1bc02f1bd427ccca2403fc2fd54341cccf8359ab301206fcc5ae4e61d13f03ee30d42b5d3ce0e14a3d357b7d54
-  data.tar.gz: e61ee50affe2a0aa4a2ea5fd5a386cad6b3a0f614c2fd3233cab5a5ae47e553eeab290ab527678265153d76352b37dac95867a1ff558b4a4c29dcafbb080fcaf
+  metadata.gz: af0af1882f81f7240438b80a4138c415ada71850395ce149f3a9b4d30b5e8858081aad9a438e9a7a9749a8e75cc0b16775aec187785a765870d4d726aa4f66e1
+  data.tar.gz: d8c3c2d0184e4e97451962203a64d7d4a2e59dd08e5e48320d05f0203a12f8e50cbd0263958d2af189c7ef84f0627f95067558321fb0d44f4ce88b7683897b5d

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

@@ -120,6 +120,8 @@ update_select_depend = function(select_name, depend_name, method) {
       $.each(data, function(index, element) {
         select_field.append( new Option(element['label'], element['id']) );
       });
+      // refresh multiple select field
+      if (select_field.hasClass('select-multiple')) { select_field.selectMultiple('refresh') }
     }
   });  
 };
@@ -292,10 +294,12 @@ process_json_result = function(json) {
             closeClass: 'dc-link' });
         }
         else {
-          $('#popup').html(value);
+          if (selector == '') { selector = 'info' }
+          let popup_html = '<div class="popup-' + selector + '">' + value + '<br><button class="dc-link">OK</button></div>';
+          $('#popup').html(popup_html);
           $('#popup').bPopup( {
             transition: 'slideDown', transitionClose: 'slideDown', speed: 300,
-            opacity: 0, position: ['auto', 20],
+            opacity: 0, position: ['auto', 'auto'],
             closeClass: 'dc-link' });
         }
         // resize parent iframe if smaller then 500px to ensure popup some space
@@ -520,19 +524,44 @@ dc_image_preview = function(img) {
  *******************************************************************/
 dc_image_select = function(img) {
   let ck_func_name = $.getUrlParam('CKEditorFuncNum');
-  let field_name = $.getUrlParam('field_name');
-  if (ck_func_name !== '') {
+  let field_name   = $.getUrlParam('field_name');
+  if (ck_func_name) {
     window.opener.CKEDITOR.tools.callFunction(ck_func_name, img);
   } else {
     window.opener.document.getElementById(field_name).value = img;
+
+    // update image preview
+    //let img_src = window.opener.$(`#td_${field_name} .dc-image-preview img`);
+    //img_src.attr("src", img);
+
+    // even better. Click save button.
+    window.opener.$(`.mi.mi-save`).first().click();
   }
   window.close();
 };
 
-
 /*******************************************************************
- * Events start here
+ * Resize iframe_embedded to the size of form.
  *******************************************************************/
+function resize_iframe_embedded(that) {
+  let embedded_height = that.contentWindow.document.body.offsetHeight;
+  // workaround. It gets tricky when embedded field is on tab
+  if (embedded_height == 0) embedded_height = 50;
+  that.style.height = (embedded_height + 30) + 'px';
+  // resize parent element too
+  let parentWindow= that.contentWindow.parent;
+  let parent_height= (parentWindow.document.body.offsetHeight + 30) + 'px';
+  parentWindow.frameElement.style.height = parent_height;
+};
+
+
+/*******************************************************************
+ *
+ *
+ * EVENTS START HERE
+ *
+ *
+ ********************************************************************/
 $(document).ready( function() {
 /* This could be the way to focus on first input field on document open
   if ( $('.dc-form')[0] ) {
@@ -580,6 +609,7 @@ $(document).ready( function() {
   $('.cms-toggle').bind('click', function(e) {
     var url = '/dc_common/toggle_edit_mode?return_to=' + window.location.href;
     if (e.pageX < 30) url = url + '&return_to_ypos=' + e.pageY ;
+    console.log(url);
     window.location.href = url;
   });
  
@@ -691,7 +721,7 @@ $(document).ready( function() {
   });  
 
 /*******************************************************************
- * Resize iframe_cms to the size of its contents. Make at least 500 px high
+ * Resize iframe_cms on load to the size of its contents. Make at least 500 px high
  * unless on initial display.
  *******************************************************************/
   $('#iframe_cms').on('load', function() {
@@ -703,7 +733,7 @@ $(document).ready( function() {
   });
 
 /*******************************************************************
- * Same goes for editiframe. Resize it + 30px
+ * Resize iframe_edit on load to the size of its contents. Resize it + 30px
  * unless on initial display with no data 
  *******************************************************************/
   $('#iframe_edit').on('load', function() {
@@ -715,18 +745,16 @@ $(document).ready( function() {
   });
 
   /*******************************************************************
-   * Same goes for iframe_embedded. Resize it + 30px
+   * Resize iframe_embedded on load to the size of its contents.
+   * It doesn't work well with firefox, when CK editor object is on the form.
+   * Adding some delay is resolving the problem.
    *******************************************************************/
   $('.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 = 50;
-    this.style.height = (embedded_height + 30) + 'px';
-    // resize parent iframe window too
-    let parentWindow = this.contentWindow.parent;
-    let parent_height = (parentWindow.document.body.offsetHeight + 30) + 'px';
-    //parentWindow.frameElement.setAttribute('style', 'height:' + parent_height);
-    parentWindow.frameElement.style.height = parent_height;
+    if (/Firefox/.test(navigator.userAgent)) {
+      setTimeout(resize_iframe_embedded, 100, this);
+    } else {
+      resize_iframe_embedded(this);
+    }
   });
 
 /*******************************************************************
@@ -856,11 +884,13 @@ $(document).ready( function() {
     let title = this.getAttribute("title");
     let w = this.getAttribute("data-x") || 1000;
     let h = this.getAttribute("data-y") || 800;
+    let offset = parent.window.scrollY || window.scrollY;
 
     url = dc_url_add_params(this, url)
     $('#popup').bPopup({ loadUrl: url,
-                             transition: 'slideDown', transitionClose: 'slideDown', speed: 300,
-                             opacity: 0, position: ['auto', 20],
+                             transition: 'slideDown', transitionClose: 'slideDown',
+                             speed: 300, opacity: 0,
+                             position: ['auto', offset + 20],
                              closeClass: 'dc-link'
     });
   });

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

@@ -45,7 +45,7 @@
   font-family: DrgSans;
   font-style: normal;
   font-weight: 600;
-  src: url('ibm-plex-sans-600.woff2') format('woff2')
+  src: url('ibm-plex-sans-600.woff2') format('woff2');
 }
 @font-face {
   font-family: DrgSans;
@@ -83,7 +83,6 @@ time, mark, audio, video {
 	margin:  0;
 	padding:  0;
 	border:  0;
-	font-size: 100%;
 	font: inherit;
 	vertical-align: baseline;
 }
@@ -138,6 +137,10 @@ textarea, input, select {
   max-width: 200px;
 }
 
+.dc-action-menu .ui-autocomplete-input {
+  padding: 8px 4px 8px 12px;
+}
+
 textarea:focus, input:focus, select:focus {
   border: 1px solid rgba(44, 142, 255, 1);
   outline: 1px solid rgba(44, 142, 255, 1);
@@ -643,8 +646,7 @@ display: inline-table;
 /*****   FORM    *****/
 
 #dc-form-container {
-  display: flex;
-  padding-left: 4px;
+  /*display: flex;*/
 }
 
 #dc-form-left {
@@ -659,7 +661,7 @@ display: inline-table;
 }
 
 .dc-form-frame {
-  margin: 0px;
+  margin: 0;
   padding: 4px;
 }
 
@@ -683,7 +685,6 @@ display: inline-table;
   border-radius: 2px;
   margin: 2px 0;
 }
-
 .dc-form-warning {
   padding: 8px;
   background-image: linear-gradient(to bottom, rgba(213, 143, 218, 0.1) 0, rgba(213, 143, 218, 0.5) 100%);
@@ -715,7 +716,7 @@ display: inline-table;
   color: #555;
   text-align: right;
   vertical-align: middle;
-  font-weight: 600;
+  font-weight: 500;
   padding: 10px 2px;
   width: 150px;
 }
@@ -735,6 +736,8 @@ display: inline-table;
 
 .dc-form-label.dc-color-odd, .dc-form-label.dc-color-even {background-color: transparent;}
 
+.dc-form-label.dc-width-0 { padding: 0;}
+
 .dc-align-left {
   text-align: left;
 }
@@ -745,7 +748,7 @@ display: inline-table;
 .dc-form-field {
   text-align: left;
   padding: 4px 2px;
-  z-index: 10;
+  /*z-index: 10;*/
   white-space: nowrap;
   text-overflow: fade;
 }
@@ -1076,6 +1079,7 @@ font-size: 1.2em;
   font-size: 1.1em;
   line-height: 1.4em;
 }
+
 /****** jquery ui-autocomplete widget ***************/
 .ui-autocomplete-input {
   padding: 8px 4px 8px 12px;
@@ -1137,16 +1141,7 @@ color: #000;
   margin-left: 4px;
 }
 
-
-.dc-red { color: #f76;}
-.dc-red:hover { color: #c43;}
-.dc-green { color: #9c9;}
-.dc-green:hover { color: #6a6;}
-
-.aui-corner-all {
-  background-color: lightyellow;
-}
-
+/************* login *************/
 #dc-login {
   position: fixed;
   top: 50%;
@@ -1206,10 +1201,10 @@ color: #000;
   color: white;
 }
 .iframe_embedded {
-  padding: 4px;
+  padding: 2px;
   background-color: #fff;
   border-radius: 2px;
-  border: 2px solid #666;
+  border: 2px solid #888;
 }
 
 #iframe_edit, #iframe_cms {
@@ -1387,6 +1382,7 @@ color: #000;
   max-height: 700px;
   overflow-y: auto;
   max-width: 800px;
+  line-height: 1.5em;
 }
 
 #popup .dc-help h1 {
@@ -1480,6 +1476,35 @@ color: #000;
   display: inline-flex;
 }
 
+#popup:has(.popup-info) {
+  padding: 1rem;
+  background-image: linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);
+  color: darkgreen;
+  font-weight: 600;
+  font-size: 1.1em;
+  min-width: 30%;
+  border: 2px solid darkgreen;
+}
+
+#popup:has(.popup-error) {
+  padding: 1rem;
+  background-image: linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);
+  color: #a94442;
+  font-weight: 600;
+  font-size: 1.1em;
+  min-width: 30%;
+  border: 2px solid #a94442;
+}
+
+#popup .popup-info button, #popup .popup-error button {
+  margin-top: 1rem;
+  padding: 4px 2rem;
+  line-height: initial;
+  filter: none;
+  border: 2px solid #222;
+  border-radius: 5px;
+}
+
 .filter-popup {
   background-color: #fff;
   filter: drop-shadow(2px 2px 8px #888);
@@ -1549,7 +1574,7 @@ cursor: pointer;
 
 #drgcms_filter h1 {
   font-size: 1.8em;
-  font-width: 600;
+  font-weight: 600;
   color: rgba(44, 142, 255, 1);
 }
 
@@ -1572,6 +1597,36 @@ cursor: pointer;
   margin-left: 1px;
 }
 
+/**** reports ****/
+.report .dc-title { color: #003A68; }
+.report .dc-result-header {
+  border-bottom: 2px solid #003A68;
+}
+.report .dc-result-header .th {
+  color: #003A68;
+  padding: 3px;
+}
+
+.report .dc-result-data {
+  padding: 0;
+}
+
+.report.dc-form-frame {
+  padding: 0;
+}
+
+
+.report .dc-result-data .td {
+  padding: 3px;
+}
+
+.iframe_embedded#if_dc_temp {
+  border: none;
+  padding: 0;
+}
+
+.report .dc-odd {background-color: #e0eeff;}
+
 /**  Radio button input field **/
 
 .dc-radio {
@@ -1613,18 +1668,13 @@ cursor: pointer;
 @media only screen and (max-device-width: 600px) {
   #body-cms {font-size: 11px;}
   #site-top div:nth-of-type(2) {padding-top: 0 !important;}
-  .dc-title { font-size: 1.5em;}
-
-  .dc-form {
-    border: none;
-    border-top: 2px solid #888;
-    border-bottom: 2px solid #888;
-    margin-top: 4px;
+  .dc-title {
+    font-size: 1.5em;
+    padding-bottom: 4px;
   }
+  .dc-form-field { padding-bottom: 4px; }
 
-  .dc-form .row-div {
-    display: block;
-  }
+  .dc-form .row-div { display: block; }
   .dc-form-li {margin-top: 3px;}
 
   .dc-form-label {
@@ -1635,6 +1685,7 @@ cursor: pointer;
   }
   .dc-form-label label {
     font-size: 15px;
+    padding: 0;
   }
 
   .dc-menu { padding: 0;}
@@ -1670,6 +1721,13 @@ cursor: pointer;
     font-size: 2em;
   }
 
+  #menu-hamburger .mi:before{
+    background-color: #222;
+    color: #fff;
+    padding: 1px;
+    border-radius: 2px;
+  }
+
   .cmsedit-container {display: block;}
   .cmsedit-container #cms-menu {display: none;}
   .cmsedit-container #cms-menu.visible {

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

@@ -63,20 +63,19 @@
 }
 
 .ms-container .ms-selectable li.ms-elem-selectable{
-  padding: 3px 10px;
+  padding: 5px 10px;
   color: #444;
-/*  font-size: 14px;*/
 }
 
-.ms-container .ms-selectable li:nth-child(odd) {
-  background-color: #f4f4f4;
+.ms-container .ms-selectable li:nth-child(even) {
+  background-color: #f8f8f8;
 }
 
 .ms-container .ms-selectable li.ms-hover{
   cursor: pointer;
   color: #fff;
   text-decoration: none;
-  background-color: #08c;
+  background-color: rgba(76,154,255, 0.6);
 }
 
 .ms-container .ms-selectable li.disabled{
@@ -92,10 +91,10 @@
 
 .ms-container .ms-selected {
   font-weight: 600;
+  color: darkblue !important;
 }
 
 .pull-right.ms-elem-selected{
   float: right;
-  font-size: smaller;
   padding-left: 4px;
 }

data/app/controllers/cmsedit_controller.rb

@@ -77,7 +77,7 @@
 ########################################################################
 class CmseditController < DcApplicationController
 before_action :check_authorization, :except => [:login, :logout, :test, :run]
-protect_from_forgery with: :null_session, only: Proc.new { |c| c.request.format.json? }
+protect_from_forgery with: :null_session, only: Proc.new { _1.request.format.json? }
   
 layout 'cms'
 
@@ -108,6 +108,10 @@ end
 ########################################################################
 def show
   find_record
+  if @record.nil?
+    flash[:error] ||= t('drgcms.doc_no_edit')
+    return index
+  end
   # before_show callback
   if (m = callback_method('before_show') )
     ret = call_callback_method(m)
@@ -270,11 +274,8 @@ def create
   # create document
   if params['id'].nil?
     # 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] && !Rails.env.test?
+    return index if double_form_submit?
 
-    session[:form_time_stamp] = params[:form_time_stamp]
     create_new_empty_record
     if save_data
       flash[:info] = t('drgcms.doc_saved')
@@ -549,14 +550,14 @@ def check_authorization
   end
   dc_form_read
 
-  # Permissions can be also defined on form
+  # Permissions can be also defined in form
   #TODO So far only can_view is used. Think about if using other permissions has sense
   can_view = @form.dig('permissions','can_view')
-  if can_view.nil? or dc_user_has_role(can_view)
+  if can_view.nil? || can_view.split(',').any? { |role| dc_user_has_role(role) }
     extend_with_control_module
   else
     render(action: 'error', locals: { error: t('drgcms.not_authorized')} )
-  end  
+  end
 end
 
 ########################################################################
@@ -716,10 +717,10 @@ def save_data
 
   form_fields.each do |v|
     session[:form_processing] = v['name'] # for debuging
-    next if v['type'].nil? or v['name'].nil? or
-            v['type'].match('embedded') or # don't wipe embedded types
-            (params[:edit_only] and params[:edit_only] != v['name']) or # otherwise other fields would be wiped
-            v['readonly'] or # fields with readonly option don't return value and would be wiped
+    next if v['type'].nil? || v['name'].nil? ||
+            v['type'].match('embedded') || # don't wipe embedded types
+            (params[:edit_only] && params[:edit_only] != v['name']) || # otherwise other fields would be wiped
+            v['readonly'] || # fields with readonly option don't return value and would be wiped
             !@record.respond_to?(v['name']) # there are temporary fields on the form
     # good to know! How to get type of field @record.fields[v['name']].type
     # return value from form field definition
@@ -736,7 +737,7 @@ def save_data
 
   # save data
   changes = @record.changes
-  update_standards() if changes.size > 0  # update only if there has been some changes
+  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, @record.previous_changes)
@@ -751,9 +752,9 @@ end
 # in select_fields and deny_fields
 ########################################################################
 def separated_to_symbols(data)
-  data.chomp.split(',').map { |e| e.strip.downcase.to_sym }
+  data.chomp.split(',').map { _1.strip.downcase.to_sym }
 end
-  
+
 ########################################################################
 # Will process only (select_fields) and without (deny_fields) option
 ########################################################################
@@ -877,19 +878,14 @@ def process_collections #:nodoc
 end
 
 ########################################################################
-# Process index action for in memory data.
+# Process index action for in memory data. default_filter method must fill @records array
+# with data, that will be shown in browser.
 ########################################################################
 def process_in_memory #:nodoc
   @records = []
   # result set is defined by filter method in control object
-  if (method = @form['result_set']['filter'])
-    send(method) if respond_to?(method)    
-  end
-  # result set is defined by class method
-  if (klass_method = @form['result_set']['filter_method'])
-    _klass, method = klass_method.split('.')
-    klass = _klass.classify.constantize
-    @records = klass.send(method) if klass.respond_to?(method)
+  if (method = @form['result_set']['filter'] || 'default_filter')
+    send(method) if respond_to?(method)
   end
   # ensure that record has id field
   if @records.size > 0
@@ -898,4 +894,41 @@ def process_in_memory #:nodoc
   false
 end
 
+########################################################################
+# Prevent double form submit
+#
+# There was a problem with old solution when user opened another browser session while
+# entering data into new document. If in new session user added document to some other
+# collection, save to document in primary session was silently ignored. Now creation time for last three forms
+# is remembered. This will work unless user tries to add new document to the same collection in another session.
+# But that is highly unlikely.
+########################################################################
+def double_form_submit?
+  session[:dfs] ||= {}
+  form_name = CmsHelper.form_param(params) || CmsHelper.table_param(params)
+  params[:form_time_stamp] = params[:form_time_stamp].to_i
+  if params[:form_time_stamp] <= update_dfs_time(form_name) && !Rails.env.test? # test must be excluded
+    flash[:error] = I18n.t('drgcms.dfs')
+    return true
+  end
+  update_dfs_time(form_name, params[:form_time_stamp])
+
+  false
+end
+
+########################################################################
+# Updates double_form_submit timings.
+########################################################################
+def update_dfs_time(form_name, time = nil)
+  if time.nil?
+    session[:dfs][form_name] ||= 0
+  else
+    session[:dfs][form_name] = time
+    if session[:dfs].size > 3
+      oldest = session[:dfs].invert.min
+      session[:dfs].delete(oldest.last)
+    end
+  end
+end
+
 end

data/app/controllers/dc_application_controller.rb

@@ -85,7 +85,7 @@ def dc_get_site
   uri  = URI.parse(request.url)
   cache_key = ['dc_site', uri.host]
 
-  @site = dc_cache_read(cache_key)
+  @site = DrgCms.cache_read(cache_key)
   return @site if @site
 
   @site = DcSite.find_by(name: uri.host)
@@ -100,7 +100,7 @@ def dc_get_site
     @site = DcSite.find_by(name: @site.alias_for) if @site
   end
   @site = nil if @site && !@site.active # site is disabled
-  dc_cache_write(cache_key, @site)
+  DrgCms.cache_write(cache_key, @site)
 end
 
 ##########################################################################
@@ -160,15 +160,10 @@ protected
 #   if dc_user_can(DcPermission::CAN_VIEW, params[:table]) then ...
 ############################################################################
 def dc_user_can(permission, table = params[:table])
-  table = table.underscore
-  cache_key = ['dc_permission', table, dc_get_site.id]
-  permissions = DrgCms.cache_read(cache_key)
-  if permissions.nil?
-    permissions = DcPermission.permissions_for_table(table)
-    DrgCms.cache_write(cache_key, permissions)
-  end
   return false if session[:user_roles].nil?
 
+  table = table.underscore
+  permissions = DrgCms.cache_read(['dc_permission', table, dc_get_site.id]) { DcPermission.permissions_for_table(table) }
   session[:user_roles].inject(false) { |r, rule| break true if permissions[rule] && permissions[rule] >= permission }
 end
 
@@ -800,7 +795,7 @@ private
 #
 # @return [Boolean] : True if  redis cache store is active
 ########################################################################
-def redis_cache_store?
+def xredis_cache_store?
   (Rails.application.config.cache_store.first == :redis_cache_store) rescue false
 end
 
@@ -809,31 +804,33 @@ end
 #
 # @return [Object] : Redis object
 ########################################################################
-def redis
+def xredis
   Rails.cache.redis
 end
 
 ########################################################################
-# Extends DRGCMS form file. Extended file is processed first and then merged
+# Extends DRG CMS form file. Extended file is processed first and then merged
 # with code in this form file. Form can extend only single form file.
 #
 # [Parameters:]
 # [extend_option] : Value of @form['extend'] option
 ########################################################################
 def dc_form_extend(extend_option)
-  form_file_name = CmsHelper.form_file_find(extend_option)
-  @form_js << read_js_drg_form(form_file_name)
-  form  = YAML.load_file( form_file_name )
-  @form = CmsHelper.forms_merge(form, @form)
-  # If combined form contains tabs and fields options, merge fields into tabs
-  if @form['form']['tabs'] && @form['form']['fields']
-    @form['form']['tabs']['fields'] = @form['form']['fields']
-    @form['form']['fields'] = nil
+  extend_option.chomp.split(',').each do |a_file|
+    form_file_name = CmsHelper.form_file_find(a_file.strip)
+    @form_js << read_js_drg_form(form_file_name)
+    form  = YAML.load_file( form_file_name )
+    @form = CmsHelper.forms_merge(form, @form)
+    # If combined form contains tabs and fields options, move fields into fields tab
+    if @form.dig('form', 'tabs') && @form.dig('form', 'fields')
+      @form['form']['tabs']['fields'] = @form['form']['fields']
+      @form['form']['fields'] = nil
+    end
   end
 end
 
 ########################################################################
-# Include code from another DRGCMS form file. Included code is merged
+# Include code from another DRG CMS form file. Included code is merged
 # with current form file code. Form can include more than one other DRGCMS forms.
 #
 # [Parameters:]