drg_cms 0.6.1.5 → 0.6.1.11

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,12 @@ end
 ######################################################################
 # List all collections
 ######################################################################
-def collections()
+def collections
   @records = []
   all_collections.each do |collection|
-    @records << {'id' =>  collection, 'description' => t("helpers.label.#{collection}.tabletitle") } 
+    next if params[:filter] && !collection.match(/#{params[:filter]}/i)
+
+    @records << DcMemory.new({'id' =>  collection, 'description' => t("helpers.label.#{collection}.tabletitle") })
   end
   @records
 end
@@ -70,7 +59,7 @@ end
 ######################################################################
 # List field definition for single model
 ######################################################################
-def all_fields()
+def all_fields
   @records = []
   model = params[:id].classify.constantize
   document = model.new
@@ -80,25 +69,27 @@ 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
+  # embedded documents
   document.embedded_relations.each do |a_embedded|
     embedded = a_embedded.last
     description = I18n.t("helpers.help.#{params[:id]}.#{embedded.key}")
     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,129 @@
+#--
+# 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] ||= {}
+  session[table_name][:page] = 1
+  set_session_filter(table_name)
+  url = url_for( controller: 'cmsedit', t: table_name, f: CmsHelper.form_param(params))
+
+  respond_to do |format|
+    format.json { render json: { url: url } }
+    format.html { redirect_to url }
+  end
+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
@@ -132,7 +132,7 @@ end
 # Export data to Excel
 ######################################################################
 def export_to_excel(report_id)
-  read_drg_form if @form.blank?
+  dc_form_read if @form.blank?
   # use report options if present
   columns = (@form['report'] ? @form['report'] : @form)['result_set']['columns'].sort
 

data/app/controls/design_element_settings_control.rb

@@ -58,7 +58,7 @@ def get_settings()
 # Check fild name 
   begin
     document = model.find(params[:id])
-    params[:field_name] ||= (params[:location] == 'dc_site' ? 'options' : 'params')
+    params[:field_name] ||= (params[:location] == 'dc_site' ? 'settings' : 'params')
 # field not defined on document   
     raise unless document.respond_to?(params[:field_name])
     yaml = document[params[:field_name]] || ''

data/app/forms/all_options.yml

@@ -51,6 +51,14 @@ index:
       eval: ModulClassName.menu_for(self)
       caption: Some caption
 
+# result_set method
+result_set:
+  type: method
+  eval: my_helper_method
+# or
+  view: path_to/_partial
+
+# result_set default
 result_set:
   filter: custom_filter
   footer: custom_footer
@@ -86,7 +94,7 @@ result_set:
       type: delete
       title: Delete it
       icon: delete.png
-      icon: arrow-left
+      icon: arrow_back
       icon: home
     4:
       type: link
@@ -140,8 +148,17 @@ form:
       method: (get),put,post
       caption: ajax_call
       control: control_name.method_to_call
-      when_new: false
-      show: default always readonly
+      show: default || always || readonly
+
+      active: not_new_record
+      active: new_record
+      active: SomeClass.is_active_method
+      or
+      active:
+        method: SomeClass.is_active_method
+      html:
+        data-validate: no
+
     5: 
       type: window
       controller: cmsedit
@@ -150,15 +167,17 @@ form:
       action: edit
       method: (get),put,post
       caption: Edit linked document
-      when_new: false
       params:
         id:
           object: record (can be omitted)
           method: page_id
         user:
           object: session
-          method: user_id          
-      
+          method: user_id
+      html:
+        data-x: 800
+        data-y: 400
+        data-fields: field1,field2,...
     6: 
       type: script
       caption: Cancle 
@@ -166,7 +185,6 @@ form:
     7:
       type: submit
       caption: Send
-      when_new: false
       params:
         before-save: send_mail
         after-save: return_to parent.reload

data/app/forms/cms_menu.yml

@@ -24,124 +24,124 @@
 menu:
   10_system_menu:
     caption: drgcms.cms_main
-    icon: support lg
+    icon: support
     
     items:
       10: 
         caption: helpers.label.dc_site.tabletitle
         controller: cmsedit
-        icon: globe lg
+        icon: public
         table: dc_site
       20: 
         caption: helpers.label.dc_design.tabletitle
         controller: cmsedit
-        icon: credit-card lg
+        icon: web
         table: dc_design
       30: 
         caption: helpers.label.dc_page.tabletitle
         controller: cmsedit
-        icon: file-text-o lg
+        icon: description-o
         table: dc_page
       50: 
         caption: helpers.label.dc_piece.tabletitle
         controller: cmsedit
-        icon: puzzle-piece lg
+        icon: extension-o
         table: dc_piece
       60: 
         caption: helpers.label.dc_link.tabletitle
         controller: cmsedit
-        icon: link lg
+        icon: link
         table: dc_link
       70: 
         caption: helpers.label.dc_menu.tabletitle
         controller: cmsedit
-        icon: th-list lg
+        icon: menu
         table: dc_menu
       80: 
         caption: helpers.label.dc_simple_menu.tabletitle
         controller: cmsedit
-        icon: ellipsis-h lg
+        icon: more_horiz-o
         table: dc_simple_menu
       90: 
         caption: helpers.label.dc_category.tabletitle
         controller: cmsedit
-        icon: list lg
+        icon: list
         table: dc_category
       100: 
         caption: helpers.label.dc_poll.tabletitle
         controller: cmsedit
-        icon: list-alt lg
+        icon: poll-o
         table: dc_poll
       110: 
         caption: helpers.label.dc_poll_result.tabletitle
         controller: cmsedit
-        icon: database lg
+        icon: leaderboard
         table: dc_poll_result
       120: 
         caption: helpers.label.dc_ad.tabletitle
         controller: cmsedit
-        icon: money lg
+        icon: ads_click
         table: dc_ad
 
   11_system_menu:
     caption: drgcms.cms_advanced
-    icon: star lg
+    icon: star
     items:
       10: 
         caption: helpers.label.dc_user.tabletitle
         controller: cmsedit
-        icon: users lg
+        icon: account_circle-o
         table: dc_user
       20: 
         caption: helpers.label.dc_policy_role.tabletitle
         controller: cmsedit
-        icon: user-secret lg
+        icon: manage_accounts
         table: dc_policy_role
       30: 
         caption: helpers.label.dc_permission.tabletitle
         controller: cmsedit
-        icon: shield lg
+        icon: security
         table: dc_permission
       40: 
         caption: helpers.label.dc_folder_permission.tabletitle
         controller: cmsedit
-        icon: shield lg
+        icon: shield-o
         table: dc_folder_permission
       60: 
         caption: helpers.label.dc_big_table.tabletitle
         controller: cmsedit
-        icon: table lg
+        icon: topic-o
         table: dc_big_table
       70: 
         caption: helpers.label.dc_key_value_store.tabletitle
         controller: cmsedit
-        icon: list lg
+        icon: view_list
         table: dc_key_value_store
       80: 
         caption: helpers.label.dc_filter.tabletitle
         controller: cmsedit
-        icon: filter lg
+        icon: topic-o
         table: dc_filter
       90: 
         caption: helpers.label.dc_removed_url.tabletitle
         controller: cmsedit
-        icon: trash-o lg
+        icon: link_off
         table: dc_removed_url
       400:
         caption: drgcms.dc_help.title
         controller: cmsedit
-        icon: question-circle lg
+        icon: help-o
         table: dc_temp
         form_name: dc_help_1
       500: 
         caption: helpers.label.dc_journal.tabletitle
         controller: cmsedit
-        icon: history lg
+        icon: history
         table: dc_journal
 
       600: 
         caption: drgcms.browse_collections
         controller: cmsedit
-        icon: table lg
+        icon: list_alt
         table: dc_memory
         form_name: dc_browse_models

data/app/forms/dc_browse_fields.yml

@@ -6,27 +6,31 @@ controls: browse_models
 permissions:
   can_view: admin
 
+index:
+  actions:
+    1: back
+
 result_set:
-  filter: fields
-  tr_style:
-    eval: "document['field'] == document['description'] ? 'color: #669;' : 'color: #000;'"
+  filter: all_fields
 
   columns:
     10:   
       name: collection
       caption: Collection
-      td_style: 'width: 150px;'
-    20:  
+      width: 10%
+    20:
       name: field
       caption: Field name
-      td_style: 'width: 150px;'
-    30:  
+    30:
       name: type
       caption: Field type
-    40:  
+    40:
       name: description
       caption: description
-    50:  
+      width: 25%
+      style:
+        eval: "document['field'] == document['description'] ? 'color: #f43;' : 'color: #000;'"
+    50:
       name: _default
       caption: Default
       

data/app/forms/dc_browse_models.yml

@@ -6,6 +6,16 @@ controls: browse_models
 permissions:
   can_view: admin
 
+index:
+  actions:
+    10:
+      type: field
+      name: filter
+      field_type: text_field
+      caption: Filter
+      size: 10
+
+
 result_set:
   filter: collections
 
@@ -19,8 +29,20 @@ result_set:
     10:   
       name: id
       caption: Collection
-      td_style: 'font-weight: bold;width: 150px;'
-      
+      td_style: 'font-weight: bold;'
+
     20:  
       name: description
       caption: Decription
+
+script: '
+$(document).ready( function() {
+  $("#record_filter").keydown( function(e) {
+    if (e.which == "13" || e.which == "9") {
+      let url = "/cmsedit?form_name=dc_browse_models&table=dc_memory&filter=" + this.value;
+      window.location.href = url;
+      e.preventDefault();
+    };
+  });
+});
+'

data/app/forms/dc_poll_result_export.yml

@@ -8,7 +8,7 @@ form:
       type: script
       caption: drgcms.back
       js: 'history.back();'
-      icon: arrow-left
+      icon: arrow_back
 
     3: 
       type: ajax

data/app/forms/dc_site.yml

@@ -84,12 +84,8 @@ form:
         name: document_extension
         type: text_field
         size: 10
-      25:
-        name: site_layout
-        type: text_field
-        size: 20
       30:
-        name: page_table
+        name: site_layout
         type: text_field
         size: 20
       40:
@@ -152,3 +148,4 @@ form:
         caption: false
         type: embedded
         form_name: dc_part
+        load: delay

data/app/forms/dc_steps_template.yml

@@ -0,0 +1,51 @@
+## Template for standard options on wizard form
+form:
+  css: '#dc-form-left {display: block;width: 20%}'
+  actions:
+    1:
+      type: ajax
+      caption: drgcms.cancel
+      icon: cancel
+      method: post
+      form_name: x
+      action: run
+      control: x.steps_cancel
+      params:
+        step: x
+        next_step: x
+
+    10:
+      type: ajax
+      caption: drgcms.back
+      icon: arrow-back
+      method: post
+      form_name: x
+      action: run
+      control: x.steps
+      params:
+        step: x
+        next_step: x
+
+    20:
+      type: ajax
+      caption: drgcms.next
+      icon: arrow-forward
+      method: post
+      form_name: x
+      action: run
+      control: x.steps
+      params:
+        step: x
+        next_step: x
+
+    100:
+      type: ajax
+      caption: drgcms.finish
+      icon: done
+      method: post
+      form_name: x
+      action: run
+      control: x.steps_finish
+      params:
+        step: x
+        next_step: x