drg_cms 0.7.0.2 → 0.7.1.1

data/app/helpers/dc_application_helper.rb

@@ -260,7 +260,7 @@ def dc_table_title(text, result_set = nil)
   c = %(<div class="dc-title">#{text})
   c << dc_help_button(result_set)
 
-  if result_set && result_set.respond_to?(:current_page)
+  if result_set&.respond_to?(:current_page)
     c << %(<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no', filter: nil})}</div>)
   end
   c << '<div style="clear: both;"></div></div>'
@@ -268,26 +268,27 @@ def dc_table_title(text, result_set = nil)
 end
 
 ############################################################################
-# Creates title for cmsedit edit action dialog. 
-#  
+# Creates title for cmsedit edit action dialog.
+#
 # Returns:
 # String. HTML code for title.
 ############################################################################
 def dc_edit_title
   session[:form_processing] = "form:title:"
-  title = @form['form']['title']
+  title_data = @form['form']['title']
+  if title_data.class == String
+    t(title_data, title_data)
   # defined as form:title:edit
-  if title && title['edit'] && !@form['readonly']
-    t( title['edit'], title['edit'] )
-  elsif title && title['show'] && @form['readonly']
-    t( title['show'], title['show'] )
+  elsif title_data&.dig('edit') && !@form['readonly']
+    t( title_data['edit'], title_data['edit'] )
+  elsif title_data&.dig('show') && @form['readonly']
+    t( title_data['show'], title_data['show'] )
   else
-    # concatenate title
     c = (@form['readonly'] ? t('drgcms.show') : t('drgcms.edit')) + " : "
     c << (@form['title'].class == String ? t( @form['title'], @form['title'] ) : t_tablename(@form['table']))
-    title = title.try('field')
-
-    c << "#{@record[ title ]}" if title && @record.respond_to?(title)
+    # add description field value to title
+    field_name = title_data['field'] if title_data
+    c << " : #{@record[ field_name ]}" if field_name && @record.respond_to?(field_name)
     c
   end
 end
@@ -300,14 +301,18 @@ end
 ############################################################################
 def dc_new_title
   session[:form_processing] = "form:title:"
-  title = @form['form']['title']
+  title_data = @form['form']['title']
+  if title_data.class == String
+    t(title_data, title_data)
   # defined as form:title:new
-  if title && title['new']
-    t( title['new'], title['new'] )
+  elsif title_data&.dig('new')
+    t( title_data['new'], title_data['new'] )
   else
     # in memory structures
     if @form['table'] == 'dc_memory'
-      t( @form['title'], @form['title'] )
+      return t( @form['title'], @form['title'] ) if @form['title']
+
+      t("#{@form['i18n_prefix']}.tabletitle", '')
     else
       "#{t('drgcms.new')} : #{t_tablename(@form['table'])}"    
     end
@@ -684,51 +689,40 @@ end
 ############################################################################
 # Returns list of all collections (tables) as array of choices for usage in select fields.
 # List is collected from cms_menu.yml files and may not include all collections used in application.
-# Currently list is only used for helping defining collection names on dc_permission form. 
-# 
+# Currently list is only used for helping defining collection names on dc_permission form.
+#
 # Example (as used in forms):
 #    form:
 #      fields:
 #        10:
 #          name: table_name
 #          type: text_with_select
-#          eval: dc_choices4_all_collections      
+#          eval: dc_choices4_all_collections
 ############################################################################
 def dc_choices4_all_collections
-  choices = {}
-  DrgCms.paths(:forms).reverse.each do |path|
-    filename = "#{path}/cms_menu.yml"
-    next unless File.exist?(filename)
-
-    menu = YAML.load_file(filename) rescue nil      # load menu
-    next if menu.nil? or !menu['menu']              # not menu or error
-    menu['menu'].each do |section|
-      next unless section.last['items']             # next if no items
-      section.last['items'].each do |k, v|          # look for caption and 
-        key = v['table']
-        choices[key] ||= "#{key} - #{t(v['caption'], v['caption'])}" 
-      end
-    end
-  end  
-  choices.invert.to_a.sort # hash has to be inverted for values to be returned right
+  models = Mongoid.models.map(&:to_s).uniq.map(&:underscore).delete_if { |e| e.match('/') }
+  models.sort.inject([]) do |r, model_name|
+    r << ["#{model_name} - #{t("helpers.label.#{model_name}.tabletitle", '')}", model_name]
+  end
 end
 
 ##########################################################################
-# Returns choices for creating collection edit select field on CMS top menu.
+# Code for top CMS menu.
 ##########################################################################
-def dc_choices4_cmsmenu
+def dc_cms_menu
   menus = {}
   DrgCms.paths(:forms).reverse.each do |path|
     filename = "#{path}/cms_menu.yml"
-    next unless File.exist?(filename)
-    menu = YAML.load_file(filename) rescue nil      # load menu
-    next if menu.nil? or !menu['menu']              # not menu or error
-    menus = CmsHelper.forms_merge(menu['menu'], menus) # ignore top level part
- end
+    next if !File.exist?(filename)
+
+    menu  = YAML.load_file(filename) rescue nil # load menu
+    menus = CmsHelper.forms_merge(menu['menu'], menus) if menu.dig('menu') # merge menus
+  end
 
   html = '<ul>'
   menus.to_a.sort.each do |index, menu|    # sort menus, result is array of sorted hashes
     next unless menu['caption']
+
     icon = menu['icon'].match('/') ? image_tag(menu['icon']) : fa_icon(menu['icon']) #external or fa- image
     html << %(<li class="cmsedit-top-level-menu"><div>#{icon}#{t(menu['caption'])}</div><ul>)
     menu['items'].to_a.sort.each do |index1, value|   # again, sort menu items first 
@@ -736,19 +730,18 @@ def dc_choices4_cmsmenu
         opts = { target: value['target'] || 'iframe_cms' }
         "<li>#{dc_link_to(t(value['caption']), value['icon'] || '', value['link'], opts)}</li>"
       else
-        opts =        
-        { controller: value['controller'], 
-          action: value['action'], 
-          table: value['table'],
-          form_name: value['form_name'] || value['table'],
-          target: value['target'] || 'iframe_cms',
-        }
+        opts = { controller: value['controller'], action: value['action'],
+                 table: value['table'], form_name: value['form_name'] || value['table'],
+                 target: value['target'] || 'iframe_cms',
+               }
+        # additional parameters
+        value['params'].each { |k, v| opts[k] = dc_value_for_parameter(v) } if value['params']
         "<li>#{dc_link_to(t(value['caption']), value['icon'] || '', opts)}</li>"
       end
     end   
     html << '</ul></li>'  
   end
-  html
+  html.html_safe
 end
 
 ############################################################################
@@ -760,7 +753,7 @@ def dc_choices4_folders_list
   home   = File.join(public,dc_get_site.files_directory)
   choices = Dir.glob(home + '/**/*/').select { |fn| File.directory?(fn) }
   choices << home # add home
-  choices.collect! {|e| e.gsub(public,'')} # remove public part
+  choices.collect! { |e| e.gsub(public,'') } # remove public part
   choices.sort
 end
 
@@ -782,7 +775,7 @@ end
 #      type: select
 #      eval: dc_choices4('dc_poll','name','_id')
 ############################################################################
-def dc_choices4(model, name, id='_id', options = {})
+def dc_choices4(model, name, id = '_id', options = {})
   model = model.classify.constantize
   qry   = model.only(id, name)
   if (param = options[:site])
@@ -792,8 +785,6 @@ def dc_choices4(model, name, id='_id', options = {})
   end
   qry = qry.and(active: true) if model.method_defined?(:active)
   qry = qry.order_by(name => 1).collation(locale: I18n.locale.to_s)
-  #choices = qry.inject([]) {|result,e| result << [ e[name], e[id] ]}
-  #choices.sort_alphabetical_by(&:first) # use UTF-8 sort
   qry.map { |e| [e[name], e[id]] }
 end
 
@@ -864,10 +855,10 @@ def dc_user_can_view(ctrl, policy_id)
   policies = if site.inherit_policy.blank? 
     site.dc_policies
   else
-    Mongoid::QueryCache.cache { DcSite.find(site.inherit_policy) }.dc_policies
+    Mongo::QueryCache.cache { DcSite.find(site.inherit_policy) }.dc_policies
   end
   # permission defined by default policy
-  default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
+  default_policy = Mongo::QueryCache.cache { policies.find_by(is_default: true) }
   return cache_add(policy_id, false, 'Default access policy not found for the site!') unless default_policy
 
   permissions = {}
@@ -875,14 +866,14 @@ def dc_user_can_view(ctrl, policy_id)
   # update permissions with defined policy
   part_policy = nil
   if policy_id
-    part_policy = Mongoid::QueryCache.cache { policies.find(policy_id) }
+    part_policy = Mongo::QueryCache.cache { policies.find(policy_id) }
     return cache_add(policy_id, false, 'Access policy not found for part!') unless part_policy
 
     part_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
   end
   # apply guest role if no roles defined
   if ctrl.session[:user_roles].nil?
-    role = Mongoid::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
+    role = Mongo::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
     return cache_add(policy_id, false, 'System guest role not defined!') unless role
 
     ctrl.session[:user_roles] = [role.id]
@@ -1008,7 +999,15 @@ def dc_big_table(key)
     desc = v.value if desc.blank?       # still blank. Use value as description
     ret << [desc, v.value] 
   end
-  ret
+  ret.sort_alphabetical_by(&:first)
+end
+
+########################################################################
+# Will return name for value defined in dc_big_table
+########################################################################
+def dc_big_table_name_for_value(key, value)
+  dc_big_table(key).each { |k, val| return k if val.to_s == value.to_s}
+  '???'
 end
 
 ########################################################################
@@ -1073,25 +1072,25 @@ end
 ########################################################################
 def dc_internal_var(object, var_name, current_document = nil)
   begin
-    case
-    when object == 'session' then _origin.session[var_name]
-    when object == 'params'  then _origin.params[var_name]
-    when object == 'site'    then _origin.dc_get_site.send(var_name)
-    when object == 'page'    then _origin.page.send(var_name)
-    when object == 'record'  then
+    case object
+    when 'session' then _origin.session[var_name]
+    when 'params'  then _origin.params[var_name]
+    when 'site'    then _origin.dc_get_site.send(var_name)
+    when 'page'    then _origin.page.send(var_name)
+    when 'record'  then
       current_document ? current_document.send(var_name) : _origin.record.send(var_name)
-    when object == 'class'   then
+    when 'class'   then
       clas, method_name = var_name.split('.')
       klas = clas.classify.constantize
       # call method. Error will be caught below.
       klas.send(method_name)
     else
-      'VARIABLE: UNKNOWN OBJECT'
+      'dc_internal: UNKNOWN OBJECT'
     end
   rescue Exception => e
     Rails.logger.debug "\ndc_internal_var. Runtime error. #{e.message}\n"
     Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
-    'VARIABLE: ERROR'
+    'dc_internal: ERROR'
   end
 end
 
@@ -1119,14 +1118,13 @@ end
 # Returns:
 # HTML data to be embedded into page header
 #######################################################################
-def dc_get_json_ld()
-  return '' if @json_ld.nil? or @json_ld.size == 0
+def dc_get_json_ld
+  return '' if @json_ld.blank?
 
-  %Q[
+  %(
 <script type="application/ld+json">
-#{JSON.pretty_generate({'@context' => 'http://schema.org', '@graph' => @json_ld})}
-</script>
-].html_safe
+#{JSON.pretty_generate({ '@context' => 'http://schema.org', '@graph' => @json_ld })}
+</script>).html_safe
 end
 
 ########################################################################
@@ -1145,21 +1143,40 @@ def dc_add_json_ld(element)
 end
 
 ########################################################################
-# Will return meta data for SEO optimizations
+# Will return meta data for SEO optimizations.
+# It will also create special link rel="canonical" tag if defined in meta tags or page document.
 # 
 # Returns:
 # HTML data to be embedded into page header
 #######################################################################
-def dc_get_seo_meta_tags()
+def dc_get_seo_meta_tags
   html = ''
-  html << "<link rel=\"canonical\" href=\"#{@page.canonical_link}\">\n  " unless @page&.canonical_link.blank?
-
-  html << @meta_tags.inject('') do |r, hash|
-    r << "<meta #{hash.first} content=\"#{hash.last}\">\n  "
+  has_canonical = false
+  html << @meta_tags.inject('') do |r, tag|
+    r << if tag.first.match('canonical')
+           has_canonical = true
+           dc_get_link_canonical_tag(tag.last)
+         else
+           %(<meta #{tag.first} content="#{tag.last}">\n  )
+         end
   end if @meta_tags
+  html << dc_get_link_canonical_tag(@page&.canonical_link) unless has_canonical
   html.html_safe
 end
 
+########################################################################
+# helper for setting canonical link on the page
+#######################################################################
+def dc_get_link_canonical_tag(href = nil)
+  return %(<link rel="canonical" href="#{request.url}">\n) if href.blank?
+
+  unless href.match(/^http/i)
+    uri  = URI.parse(request.url)
+    href = "#{uri.scheme}://#{uri.host}/#{href.delete_prefix('/')}"
+  end
+  %(<link rel="canonical" href="#{href}">\n)
+end
+
 ########################################################################
 # Will add a meta tag to internal hash structure. If meta tag already exists it
 # will be overwritten.
@@ -1170,6 +1187,7 @@ end
 ########################################################################
 def dc_add_meta_tag(type, name, content)
   return if content.blank?
+
   @meta_tags ||= {}
   key = "#{type}=\"#{name}\""
   @meta_tags[key] = content
@@ -1187,8 +1205,8 @@ end
 # Returns:
 # [String] alt="image-tag"
 #######################################################################
-def dc_img_alt_tag(file_name, text=nil)
-  " alt=\"#{dc_img_alt(file_name, text)}\" ".html_safe
+def dc_img_alt_tag(file_name, text = nil)
+  %( alt="#{dc_img_alt(file_name, text)}" ).html_safe
 end
 
 #######################################################################
@@ -1203,15 +1221,19 @@ end
 # Returns:
 # [String] alt_image_name
 #######################################################################
-def dc_img_alt(file_name, text=nil)
-  return text unless text.blank?
+def dc_img_alt(file_name, text = nil)
+  return text if text.present?
+
   name = File.basename(file_name.to_s)
-  name[0,name.index('.')].downcase rescue name
+  name[0, name.index('.')].downcase rescue name
 end
 
 private
 
-# will cache dc_user_can_view response
+########################################################################
+# To cache localy dc_user_can_view response for a single call. It has large gains on sites
+# with large menus.
+########################################################################
 def cache_add(id, can_view, msg)
   @can_view_cache[id] = [can_view, msg]
 end

data/app/helpers/dc_image_helper.rb

@@ -0,0 +1,127 @@
+#--
+# 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.
+#++
+
+
+####################################################################
+# Helpers needed by some form fields
+####################################################################
+module DcImageHelper
+  
+############################################################################
+# Will return code for previewing image on top of dc_image entry form
+############################################################################
+def dc_image_preview(document, *parms)
+  src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{document.first_available_image}"
+  %(<span class="dc-image-preview dc-image-preview-1"><img src="#{src}"></img></span>).html_safe
+end
+
+############################################################################
+# Will return code for previewing resized images on dc_image entry form
+############################################################################
+def dc_image_preview_resized(document, yaml, ignore)
+  size = yaml['name'].last
+  return '' if document["size_#{size}"].blank?
+
+  src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{document.id}-#{size}.#{document.img_type}?#{Time.now.to_i}"
+  %(<span class="dc-image-preview"><img src="#{src}"></img></span><div id="dc-image-preview"></div>).html_safe
+end
+
+############################################################################
+# Will return choices for preset image sizes
+############################################################################
+def dc_image_choices_for_image_size
+  sizes = dc_get_site.params.dig('dc_image', 'sizes')
+  return ['300x200'] if sizes.blank?
+
+  sizes.split(",").map(&:strip)
+end
+
+############################################################################
+# Will return code for invoking dc_image_search form to select image select on a DRG Form.
+#
+# @param [String] field_name : Field name to which selected image value will be saved.
+###########################################################################
+def dc_image_invoke(field_name)
+  return '' unless dc_get_site.params.dig('dc_image', 'location')
+
+  url = url_for(controller: :cmsedit, form_name: :dc_image_search, table: :dc_image, field_name: field_name)
+  %(<span class="dc-window-open" data-url="#{url}" title="#{t('drgcms.dc_image.invoke')}">#{mi_icon('image-o')}</span>).html_safe
+end
+
+############################################################################
+# Will return code for previewing image on top of dc_image entry form
+############################################################################
+def first_dc_image(document, *parms)
+  src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{document.first_available_image}"
+  %(<span class="dc-image-preview"><img src="#{src}"></img></span><span id="dc-image-preview">).html_safe
+end
+
+######################################################################
+# Will format qry result as html code for selecting image
+######################################################################
+def select_links_for_dc_image(doc, *parms)
+  %w[o s m l].inject('') { | r,size| r << dc_image_link_for_select(doc, size) }.html_safe
+end
+
+######################################################################
+# Will return HTML code for selecting image
+######################################################################
+def dc_image_link_for_select(doc, what)
+  field = "size_#{what}"
+  value = doc.send(field)
+  return '' if value.blank?
+
+  value = value.split(/\+/).first
+  src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{doc.id}-#{what}.#{doc.img_type}"
+  %(
+<div class="img-link"><div>
+ #{value}<br>
+  <i class="mi-o mi-preview" onclick="dc_image_preview('#{src}');" title="#{t('drgcms.dc_image.preview')}"></i>
+  <i class="mi-o mi-check_circle" onclick="dc_image_select('#{src}');" title="#{t('drgcms.dc_image.select')}"></i>
+</div></div>)
+end
+
+######################################################################
+# Will return image file for requested size.
+#
+# @param [String] file_name : Image file name
+# @param [String] size : Preferred image size
+#
+# @return [String] : Image file name if requested size is found. Otherwise first available image.
+######################################################################
+def dc_image_get_by_size(file_name, size)
+  id = file_name[file_name.rindex('/') + 1, 24]
+  return 'error: ID not valid' unless BSON::ObjectId.legal?(id)
+
+  image = DcImage.find(id)
+  return 'error: ID not found' unless image
+
+  what = %w[o s m l].inject('l') do |r, e|
+    field_name = "size_#{e}".to_sym
+    break e if doc.send(field_name) == size
+    e
+  end
+  "/#{dc_get_site.params.dig('dc_image', 'location')}/#{doc.id}-#{what}.#{doc.img_type}"
+end
+
+end

data/app/models/concerns/dc_policy_rule_concern.rb

@@ -52,7 +52,7 @@ after_destroy :cache_clear
 def self.values_for_permissions
   key = 'helpers.label.dc_policy_rule.choices4_permission'
   c = I18n.t(key)  
-  c = I18n.t(key, locale: 'en') if c.class == Hash or c.match( 'translation missing' )
+  c = I18n.t(key, locale: 'en') if c.class == Hash || c.match(/translation missing/i)
   c.split(',').inject([]) { |r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
 end
 

data/app/models/concerns/dc_user_concern.rb

@@ -80,7 +80,7 @@ index group: 1
 validates_length_of :username, minimum: 4
 validates           :username, uniqueness: true  
 validates           :email,    uniqueness: true
-validate :do_validate
+validate            :additional_validates
 
 before_save :do_before_save
 before_validation :do_before_validation
@@ -97,8 +97,16 @@ def has_role?(role_id)
     role    = DcPolicyRole.get_role(role_id)
     role_id = role.id if role
   end
-  role = self.dc_user_roles.where(dc_policy_role_id: role_id).first
-  (role && role.active)
+  role = dc_user_roles.find_by(dc_policy_role_id: role_id)
+
+  # user can be member of groups
+  if role.nil? && member.present?
+    member.each do |group_id|
+      role = DrgCms.cached(DcUser, group_id).dc_user_roles.find_by(dc_policy_role_id: role_id)
+      break if role
+    end
+  end
+  role&.active?
 end
 
 ##########################################################################
@@ -141,7 +149,7 @@ end
 # Will return list of available groups
 ##########################################################################
 def self.groups_for_select
-  where(group: true, active: true).order_by(name: 1).inject([]) { |r, e| r << [e.name, e.id] }
+  where(group: true, active: true).order_by(name: 1).map { [_1.name, _1.id] }
 end
 
 private
@@ -169,7 +177,7 @@ end
 ##########################################################################
 # Perform some additional validations
 ##########################################################################
-def do_validate
+def additional_validates
   if group && member.present?
     errors.add('member', I18n.t('errors.messages.present'))
   end

data/app/models/dc_big_table.rb

@@ -94,7 +94,7 @@ def self.choices4(key, site = nil, locale = nil)
   end
 # Error if empty
   result = [[I18n.t('drgcms.error'),I18n.t('drgcms.error')]] if result.size == 0
-  result
+  result.sort_alphabetical_by(&:first)
 end
  
 end

data/app/models/dc_category.rb

@@ -63,6 +63,16 @@ validates :name, presence: true
 
 before_destroy :can_destroy?
 
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_category)
+end
+
 private
 
 #########################################################################
@@ -88,6 +98,8 @@ def self.values_for_parent(site_id = nil) #:nodoc:
        parent = v.parent
        until parent.nil?
          doc    = find(parent)
+         break if doc.nil?
+
          name   = doc.name + ' / ' + name
          parent = doc.parent
        end

data/app/models/dc_design.rb

@@ -124,10 +124,11 @@ end
 # have site assigned will be selected. Too much designs to select often confuses
 # end user.
 ########################################################################
-def self.choices4_design(site=nil)
-  list = site.nil? ? where(active: true) : where(active: true).in(site_id: [nil,site.id]).to_a
-  list.sort! { |w1, w2| w1.description.casecmp(w2.description) }
-  list.inject([]) { |r, design| r << [ design.description, design._id] }
+def self.choices4_design(site)
+  (site.blank? ? where(active: true) : where(:site_id.in => [nil, BSON::ObjectId.from_string(site) ], active: true))
+    .only(:id, :description)
+    .order_by(description: 1)
+    .map { |design| [design.description, design.id] }
 end
   
 end