drg_cms 0.6.1.6 → 0.6.1.9

data/app/assets/stylesheets/drg_cms_application.css

@@ -9,6 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require drg_cms/drg_cms
- *= require font-awesome
+ *= require drg_material_icons
 
 */

data/app/assets/stylesheets/drg_cms_cms.css

@@ -14,9 +14,6 @@
  *= require drg_cms/jstree
 
  *= require jquery-ui/all
- 
- *= require font-awesome
+ *= require drg_material_icons
 */
 
-/* Required for link buttons to look alike */
-.dc-link a, .dc-link-submit input {font-weight: 600; }   

data/app/controllers/cmsedit_controller.rb

@@ -99,7 +99,7 @@ end
 ########################################################################
 # Filter action. 
 ########################################################################
-def filter
+def _filter
   index
 end
 
@@ -128,12 +128,10 @@ end
 # Login can be called directly with url http://site.com/cmsedit/login
 ########################################################################
 def login
-  if    params[:id] == 'test' then set_test_site
-  elsif params[:ok]           then render action: 'login', layout: 'cms' 
-  else
-    session[:edit_mode] = 0
-    render action: 'login', layout: 'cms'
-  end
+  return set_test_site if params[:id] == 'test'
+
+  session[:edit_mode] = 0 if !params[:ok]
+  render action: 'login', layout: 'cms'
 end
 
 ########################################################################
@@ -259,12 +257,9 @@ def duplicate_document(source)
 end
 
 ########################################################################
-# Create (or duplicate) action. Action is also used for turning filter on.
+# Create (or duplicate) action.
 ########################################################################
 def create
-  # abusing create for turning filter on
-  return index if params[:filter].to_s == 'on'
-
   # not authorized
   unless dc_user_can(DcPermission::CAN_CREATE)
     flash[:error] = t('drgcms.not_authorized')
@@ -439,7 +434,7 @@ def run
   control_name, method_name = params[:control].split('.')
   if method_name.nil?
     method_name  = control_name
-    control_name = params[:table]   
+    control_name = CmsHelper.table_param(params)
   end
   # extend with control methods
   extend_with_control_module(control_name)
@@ -476,7 +471,7 @@ def can_process_run
     response = send(:dc_can_process)
     return response unless response.class == Array
   else
-    response = [DcPermission::CAN_VIEW, params[:table] || 'dc_memory']
+    response = [DcPermission::CAN_VIEW, CmsHelper.table_param(params) || 'dc_memory']
   end
   dc_user_can *response
 end
@@ -569,19 +564,19 @@ end
 # Read DRG form into @form object. Subroutine of check_authorization.
 ########################################################################
 def read_drg_form
-  table_name = decamelize_type(params[:table].strip)
-  @tables = table_name.split(';').inject([]) { |r,v| r << [(v.classify.constantize rescue nil), v] }
+  table_name = decamelize_type(CmsHelper.table_param(params).strip)
+  @tables = table_name.split(';').inject([]) { |r, v| r << [(v.classify.constantize rescue nil), v] }
 
   # split ids passed when embedded document
   ids = params[:ids].to_s.strip.downcase
   @ids = ids.split(';').inject([]) { |r,v| r << v }
 
   # form_name defaults to last table specified
-  form_name = params[:form_name] || @tables.last[1]
+  form_name = CmsHelper.form_param(params) || @tables.last[1]
   @form_js = ''
 
   # dynamically generated form
-  @form = if params[:form_name] == 'method'
+  @form = if CmsHelper.form_param(params) == 'method'
             dc_eval_class_method(params[:form_method], params)
           else
             form_file_name = dc_find_form_file(form_name)
@@ -621,7 +616,7 @@ end
 ############################################################################
 def extend_with_control_module(control_name = @form['controls'] || @form['control'])
   # May include embedded forms so ; => _
-  control_name ||= params[:table].gsub(';','_')
+  control_name ||= CmsHelper.table_param(params).gsub(';','_')
   control_name += '_control' unless control_name.match(/control$|report$/i)
   # p '************',  control_name
   controls = load_controls_module(control_name)
@@ -642,9 +637,10 @@ end
 # load DRG form.
 ############################################################################
 def check_authorization
-  params[:table] ||= params[:form_name]
+  params[:table] ||= params[:t] || CmsHelper.form_param(params)
   # Only show menu
   return login if params[:id].in?(%w(login logout test))
+
   table = params[:table].to_s.strip.downcase
   set_default_guest_user_role if session[:user_roles].nil?
   # request shouldn't pass
@@ -872,23 +868,12 @@ end
 ########################################################################
 # Will check and set sorting options for current result set. Subroutine of index method.
 ########################################################################
-def check_sort_options() #:nodoc:
+def check_sort_options #:nodoc:
   table_name = @tables.first[1]
-  old_sort = session[table_name][:sort].to_s
-  sort, direction = old_sort.split(' ')
+  return if session[table_name][:sort].nil? || @records.class != Mongoid::Criteria
 
-  if params['sort']
-    # reverse sort if same selected
-    if params['sort'] == sort
-      direction = (direction == '1') ? '-1' : '1'
-    end
-    direction ||= '1'
-    sort = params[:sort]
-    session[table_name][:sort] = "#{params['sort']} #{direction}"
-    session[table_name][:page] = 1
-  end
-  @records.sort( sort => direction.to_i ) if session[table_name][:sort] && @records.class == Mongoid::Criteria
-  params['sort'] = nil # otherwise there is problem with other links
+  sort, direction = session[table_name][:sort].split(' ')
+  @records = @records.order_by( sort => direction.to_i )
 end
 
 ########################################################################
@@ -914,82 +899,20 @@ def user_sort_options(model) #:nodoc:
   { field.to_sym => direction.to_i }
 end
 
-########################################################################
-# Will set session[table_name][:filter] and save last filter settings to session.
-# subroutine of check_filter_options.
-########################################################################
-def set_session_filter(table_name)
-  # models that can not be filtered (for now)
-  return if %w(dc_temp dc_memory).include?(params[:table])
-  # clear filter 
-  if params[:filter] == 'off' 
-    session[table_name][:filter] = nil
-    return
-  end
-  # field_name should exist on set filter condition
-  return if params[:filter_oper] && params[:filter_field].blank?
-
-  filter_value = if params[:filter_value].nil?
-    #NIL indicates that no filtering is needed
-    '#NIL'
-  else     
-    if params[:filter_value].class == String and params[:filter_value][0] == '@'
-      # Internal value. Remove leading @ and evaluate expression
-      expression = DcInternals.get(params[:filter_value])
-      eval(expression) rescue nil
-    else
-      # No filter when empty
-      params[:filter_value] == '' ? '#NIL' : params[:filter_value] 
-    end
-  end
-  # if filter field parameter is omitted then just set filter value
-  session[table_name][:filter] =
-  if params[:filter_field].nil?
-    saved = YAML.load(session[table_name][:filter])
-    saved['value'] = filter_value
-    saved.to_yaml
-  else 
-    # as field defined. Split name and alternative input field
-    field = if params[:filter_field].match(' as ')
-      params[:filter_input] = params[:filter_field].split(' as ').last.strip
-      params[:filter_field].split(' as ').first.strip
-    else
-      params[:filter_field]
-    end
-
-    {'field'     => field, 
-     'operation' => params[:filter_oper], 
-     'value'     => filter_value,
-     'input'     => params[:filter_input],
-     'table'     => table_name }.to_yaml
-  end
-  # must be. Otherwise kaminari includes parames on paging links
-  params[:filter]        = nil
-  params[:filter_id]     = nil
-  params[:filter_oper]   = nil
-  params[:filter_input]  = nil
-  params[:filter_field]  = nil
-end
-
 ########################################################################
 # Will check and set current filter options for result set. Subroutine of index method.
 ########################################################################
-def check_filter_options() #:nodoc:
-  table_name = @tables.first[1]
-  model      = @tables.first[0]
+def check_filter_options #:nodoc:
+  table_name = CmsHelper.table_param(params).strip.split(';').first.underscore
+  model      = table_name.classify.constantize
   session[table_name] ||= {}
   # page is set
   session[table_name][:page] = params[:page] if params[:page]
-  # new filter is applied
-  if params[:filter]
-    set_session_filter(table_name)
-    session[table_name][:page] = 1
-  end
   # if data model has field dc_site_id ensure that only documents which belong to the site are selected.
   site_id = dc_get_site._id if dc_get_site
 
   # don't filter site if no dc_site_id field or user is ADMIN
-  site_id = nil if !model.method_defined?('dc_site_id') or dc_user_can(DcPermission::CAN_ADMIN)
+  site_id = nil if !model.method_defined?('dc_site_id') || dc_user_can(DcPermission::CAN_ADMIN)
   site_id = nil if session[table_name][:filter].to_s.match('dc_site_id')
 
   if @records = DcFilter.get_filter(session[table_name][:filter])
@@ -999,7 +922,7 @@ def check_filter_options() #:nodoc:
   end
   process_select_and_deny_fields
   # pagination if required
-  per_page = (@form['result_set']['per_page'] || 30).to_i
+  per_page = (@form['result_set']['per_page'] || 25).to_i
   @records = @records.page(session[table_name][:page]).per(per_page) if per_page > 0
 end
 
@@ -1035,7 +958,7 @@ def process_collections #:nodoc
       process_select_and_deny_fields           
       # 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
+        per_page = (@form['result_set']['per_page'] || 25).to_i
         @records = @records.page(params[:page]).per(per_page) if per_page > 0
       end
     elsif form_filter != 'dc_filter'
@@ -1079,5 +1002,4 @@ def process_in_memory #:nodoc
   false
 end
 
-
 end

data/app/controllers/dc_common_controller.rb

@@ -217,8 +217,9 @@ def copy_clipboard
     format.json { dc_render_ajax(operation: 'window', url: request.url ) }
     
     format.html do
-      doc = dc_find_document(params[:table], params[:id], params[:ids])
-      text = "<br><br>[#{params[:table]},#{params[:id]},#{params[:ids]}]<br>"
+      table = CmsHelper.table_param(params)
+      doc   = dc_find_document(table, params[:id], params[:ids])
+      text  = "<br><br>[#{table},#{params[:id]},#{params[:ids]}]<br>"
       render plain: text + doc.as_document.to_json
     end
   end  
@@ -266,7 +267,7 @@ end
 # document.
 ########################################################################
 def add_json_ld_schema
-  edited_document = DcJsonLd.find_document_by_ids(params[:table], params[:ids])
+  edited_document = DcJsonLd.find_document_by_ids(CmsHelper.table_param(params), params[:ids])
   yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
   schema_data = yaml[params[:schema]]
   # Existing document
@@ -282,11 +283,11 @@ end
 # Will provide help data
 ########################################################################
 def help
-  form_name = params[:form_name] || params[:table]
+  form_name = CmsHelper.form_param(params) || CmsHelper.table_param(params)
   @form = form_name ? YAML.load_file(dc_find_form_file(form_name)) : {}
   return render json: {} if @form.nil?
 
-  help_file_name = @form['help'] || @form['extend'] || params[:form_name] || params[:table]
+  help_file_name = @form['help'] || @form['extend'] || form_name
   help_file_name = find_help_file(help_file_name)
   @help = YAML.load_file(help_file_name) if help_file_name
   # no auto generated help on index action

data/app/controls/browse_models_control.rb

@@ -1,4 +1,3 @@
-#encoding: utf-8
 #--
 # Copyright (c) 2014+ Damjan Rems
 #
@@ -26,31 +25,19 @@
 # 
 ######################################################################
 module BrowseModelsControl
-include DcApplicationHelper
-
-#########################################################################
-# Determine model class from filename.
-#########################################################################
-def determine_model(path)
-  path =~ /(.*)\/(.*).rb/
-  begin
-    $2.camelize.constantize 
-    $2
-  rescue Exception # it happends
-    nil
-  end
-end
 
 #########################################################################
 # Return array of all models found in application.
 #########################################################################
-def all_collections()
+def all_collections
   collections = []
   DrgCms.paths(:forms).each do |path|
     models_dir = File.expand_path("../models", path)
-    Dir["#{models_dir}/*.rb"].each do |model_file| 
-      collection_name = determine_model(model_file)
-      collections << collection_name if collection_name
+    Dir["#{models_dir}/*.rb"].each do |model_file|
+      model_file =~ /(.*)\/(.*).rb/
+      # check if model exists
+      collection = $2.camelize.constantize.new rescue nil
+      collections << collection.class.to_s.underscore if collection&.respond_to?(:_id)
     end
   end
   collections.sort
@@ -59,10 +46,10 @@ end
 ######################################################################
 # List all collections
 ######################################################################
-def collections()
+def collections
   @records = []
   all_collections.each do |collection|
-    @records << {'id' =>  collection, 'description' => t("helpers.label.#{collection}.tabletitle") } 
+    @records << DcMemory.new({'id' =>  collection, 'description' => t("helpers.label.#{collection}.tabletitle") })
   end
   @records
 end
@@ -70,7 +57,7 @@ end
 ######################################################################
 # List field definition for single model
 ######################################################################
-def all_fields()
+def all_fields
   @records = []
   model = params[:id].classify.constantize
   document = model.new
@@ -80,12 +67,13 @@ def all_fields()
     description = I18n.t("helpers.label.#{params[:id]}.#{attribute_name}") if description.match('missing:')
     description = attribute_name if description.match('missing:')
 
-    @records << {'collection' =>  params[:id], 
+    @records << DcMemory.new({id: attribute_name,
+                 'collection' =>  params[:id],
                  'field' => attribute_name, 
                  'type' => options[:type],
                  'description' => description, 
                  '_default' => options[:default]
-                } 
+                })
   end
 # embedded documents
   document.embedded_relations.each do |a_embedded|
@@ -94,11 +82,12 @@ def all_fields()
     description = I18n.t("helpers.label.#{params[:id]}.#{embedded.key}") if description.match('missing:')
     description = embedded.key if description.match('missing:')
 
-    @records << {'collection' =>  params[:id], 
+    @records << DcMemory.new({ id: embedded.key,
+                 'collection' =>  params[:id],
                  'field' => embedded.key, 
                  'type' => 'Embedded:' + embedded.class_name,
                  'description' => description
-                }
+                })
   end
 
   @records

data/app/controls/cmsedit_control.rb

@@ -0,0 +1,125 @@
+#--
+# Copyright (c) 2022+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+######################################################################
+# Common controls for cms controller
+######################################################################
+module CmseditControl
+
+######################################################################
+# Clear current form filter
+######################################################################
+def filter_off
+  table_name = CmsHelper.table_param(params).strip.split(';').first.underscore
+  session[table_name][:filter] = nil
+  session[table_name][:page] = 1
+  url = url_for( controller: 'cmsedit', t: table_name, f: CmsHelper.form_param(params))
+
+  render json: { url: url }
+end
+
+######################################################################
+# Set current form filter
+######################################################################
+def filter_on
+  table_name = CmsHelper.table_param(params).strip.split(';').first.underscore
+  session[table_name][:page] = 1
+  set_session_filter(table_name)
+  url = url_for( controller: 'cmsedit', t: table_name, f: CmsHelper.form_param(params))
+
+  render json: { url: url }
+end
+
+########################################################################
+# Will check and set sorting options for current result set. Subroutine of index method.
+########################################################################
+def sort
+  return if params['sort'].nil?
+
+  table_name = CmsHelper.table_param(params).strip.split(';').first.underscore
+  old_sort = session[table_name][:sort].to_s
+  sort, direction = old_sort.split(' ')
+  # reverse sort if same selected
+  direction = (direction == '1') ? '-1' : '1' if params['sort'] == sort
+  direction ||= '1'
+  session[table_name][:sort] = "#{params[:sort]} #{direction}"
+  session[table_name][:page] = 1
+  params['sort'] = nil # otherwise there is problem with other links
+  url = url_for( controller: 'cmsedit', t: table_name, f: CmsHelper.form_param(params))
+
+  render json: { url: url }
+end
+
+private
+########################################################################
+# Will set session[table_name][:filter] and save last filter settings to session.
+# subroutine of check_filter_options.
+########################################################################
+def set_session_filter(table_name)
+  # models that can not be filtered (for now)
+  return if %w(dc_temp dc_memory).include?(CmsHelper.table_param(params))
+  # field_name should exist on set filter condition
+  return if params[:filter_oper] && params[:filter_field].blank?
+
+  filter_value = if params[:filter_value].nil?
+                   #NIL indicates that no filtering is needed
+                   '#NIL'
+                 else
+                   if params[:filter_value].class == String && params[:filter_value][0] == '@'
+                     # Internal value. Remove leading @ and evaluate expression
+                     expression = DcInternals.get(params[:filter_value])
+                     eval(expression) rescue '#NIL'
+                   else
+                     # No filter when empty
+                     params[:filter_value] == '' ? '#NIL' : params[:filter_value]
+                   end
+                 end
+  # if filter field parameter is omitted then just set filter value
+  session[table_name][:filter] =
+    if params[:filter_field].nil?
+      saved = YAML.load(session[table_name][:filter])
+      saved['value'] = filter_value
+      saved.to_yaml
+    else
+      # as field defined. Split name and alternative input field
+      field = if params[:filter_field].match(' as ')
+                params[:filter_input] = params[:filter_field].split(' as ').last.strip
+                params[:filter_field].split(' as ').first.strip
+              else
+                params[:filter_field]
+              end
+
+      {'field'     => field,
+       'operation' => params[:filter_oper],
+       'value'     => filter_value,
+       'input'     => params[:filter_input],
+       'table'     => table_name }.to_yaml
+    end
+  # must be. Otherwise kaminari includes parames on paging links
+  params[:filter_id]     = nil
+  params[:filter_oper]   = nil
+  params[:filter_input]  = nil
+  params[:filter_field]  = nil
+end
+
+end 

data/app/controls/dc_help_control.rb

@@ -49,7 +49,7 @@ def project_refresh
                  updated_at: File.mtime(file_name)).save
     end
   end
-  render json: { url: url_for(controller: :cmsedit, table: :dc_temp, form_name: :dc_help_1) }
+  render json: { url: url_for(controller: 'cmsedit', table: :dc_temp, form_name: :dc_help_1) }
 end
 
 ######################################################################

data/app/controls/dc_page_control.rb

@@ -1,4 +1,3 @@
-#encoding: utf-8
 #--
 # Copyright (c) 2014+ Damjan Rems
 #

data/app/controls/dc_poll_result_control.rb

@@ -38,7 +38,7 @@ end
 # Filter action called. Update url to reflect filter conditions and reload form.
 ######################################################################
 def do_filter
-  url = url_for(controller: :cmsedit, action: :index, table: :dc_poll_result,
+  url = url_for(controller: 'cmsedit', action: :index, table: :dc_poll_result,
                 'record[dc_poll_id]' => params[:record][:dc_poll_id],
                 'record[start_date]' => params[:record][:start_date],
                 'record[end_date]'   => params[:record][:end_date]

data/app/controls/dc_report.rb

@@ -39,7 +39,7 @@ end
 # If exists, set report section as form, so it can be used to display result.
 ######################################################################
 def dc_update_form
-  return unless @form && @form['report'] && params[:table] == 'dc_temp'
+  return unless @form && @form['report'] && CmsHelper.table_param(params) == 'dc_temp'
 
   @form = @form['report']
 end

data/app/forms/all_options.yml

@@ -94,7 +94,7 @@ result_set:
       type: delete
       title: Delete it
       icon: delete.png
-      icon: arrow-left
+      icon: arrow_back
       icon: home
     4:
       type: link