drg_cms 0.6.1.4 → 0.6.1.9

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
 
 ######################################################################
@@ -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/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/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,15 @@ 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
+
     5: 
       type: window
       controller: cmsedit
@@ -150,15 +165,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 +183,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_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_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_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_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_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