drg_cms 0.6.1.11 → 0.7.0.8

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,64 +301,40 @@ 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
   end
 end
 
-####################################################################
-# Formats label and html input code for display on edit form.
-#  
-#  Parameters:
-#  [input_html] String. HTML code for data input field.
-#  [label] String. Input field label.
-####################################################################
-def dc_label_for(input_html, label)
-  c =<<eot
-<tr>
-  <td class="dc-edit-label">#{label}</td>
-  <td class="dc-edit-field">#{input_html}</td>
-</tr>
-eot
-  c.html_safe
-end
-
 ############################################################################
 # Similar to rails submit_tag, but also takes care of link icon, translation, ...
 ############################################################################
-def dc_submit_tag(caption, icon, parms, rest={})
-  parms['class'] ||= 'dc-link'
-  if icon
-    icon_image = if icon.match(/\./)
-      image_tag(icon)
-    elsif icon.match('<i')
-      icon
-    else
-      fa_icon(icon)
-    end
-  end
-  html = icon_image || ''
-  #html << submit_tag(t(caption, caption), parms)
-  %Q[<button type="submit" class="dc-submit" name="commit" value="#{t(caption, caption)}">#{icon_image} #{t(caption, caption)}</button>].html_safe
+def dc_submit_tag(caption, icon, parms, rest = {})
+  icon_image = dc_icon_for_link(icon, nil)
+  %(<button type="submit" class="dc-submit" name="commit" value="#{t(caption, caption)}">#{icon_image} #{t(caption, caption)}</button>).html_safe
 end
 
 ############################################################################
 # Returns icon code if icon is specified
 ############################################################################
-def dc_icon_for_link(icon)
+def dc_icon_for_link(icon, clas = 'dc-link-img')
   return '' if icon.blank?
 
   if icon.match(/\./)
-    _origin.image_tag(icon, class: 'dc-link-img')
+    _origin.image_tag(icon, class: clas)
   elsif icon.match('<i')
     icon
   else
@@ -619,7 +596,7 @@ def dc_page_edit_menu(opts = @opts)
   opts[:editparams] ||= {}
   dc_link_menu_tag(title) do |html|
     opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', 'icon' => 'edit-o' )
-    opts[:editparams].merge!( :id => page.id, :t => _origin.site.page_class.underscore, f: opts[:form_name], edit_only: 'body' )
+    opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_class.underscore, form_name: opts[:form_name], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
     opts[:editparams].merge!( edit_only: nil, 'icon' => 'edit-o' )
@@ -712,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 
@@ -764,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
 
 ############################################################################
@@ -788,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
 
@@ -810,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])
@@ -820,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
 
@@ -867,7 +830,7 @@ end
 # 
 # Parameters:
 # [ctrl] Controller object or object which holds methods to access session object. For example @parent
-# variable when called from renderer.
+# when called from renderer.
 # [policy_id] Document or documents policy_id field value required to view data. Method will automatically 
 # check if parameter send has policy_id field defined and use value of that field.
 # 
@@ -882,9 +845,11 @@ end
 # False and message from policy that is blocking view if access is not allowed.
 ############################################################################
 def dc_user_can_view(ctrl, policy_id)
-  policy_id = policy_id.policy_id if policy_id and policy_id.respond_to?(:policy_id)
+  @can_view_cache ||= {}
+  policy_id = policy_id.policy_id if policy_id&.respond_to?(:policy_id)
   # Eventualy object without policy_id will be checked. This is to prevent error
   policy_id = nil unless policy_id.class == BSON::ObjectId
+  return @can_view_cache[policy_id] if @can_view_cache[policy_id]
 
   site = ctrl.site
   policies = if site.inherit_policy.blank? 
@@ -894,7 +859,7 @@ def dc_user_can_view(ctrl, policy_id)
   end
   # permission defined by default policy
   default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
-  return false, 'Default access policy not found for the site!' unless default_policy
+  return cache_add(policy_id, false, 'Default access policy not found for the site!') unless default_policy
 
   permissions = {}
   default_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
@@ -902,28 +867,29 @@ def dc_user_can_view(ctrl, policy_id)
   part_policy = nil
   if policy_id
     part_policy = Mongoid::QueryCache.cache { policies.find(policy_id) }
-    return false, 'Access policy not found for part!' unless part_policy
+    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) }
-    return false, 'System guest role not defined!' unless role
+    return cache_add(policy_id, false, 'System guest role not defined!') unless role
+
     ctrl.session[:user_roles] = [role.id]
   end
   # Check if user has any role that allows him to view part
-  can_view, msg = false,''
-  ctrl.session[:user_roles].each do |role|
-    next unless permissions[role]          # role not yet defined. Will die in next line.
-    if permissions[role] > 0
-      can_view = true
-      break
-    end
+  can_view = ctrl.session[:user_roles].reduce(false) do |result, role|
+    break true if permissions[role] && permissions[role] > 0
   end
-  msg = if !can_view
-    part_policy ? t(part_policy.message,part_policy.message) : t(default_policy.message,default_policy.message)
+
+  msg = ''
+  unless can_view
+    msg = part_policy ? t(part_policy.message, part_policy.message) : t(default_policy.message, default_policy.message)
+    # message may have variable content
+    msg = _origin.render(inline: msg, layout: nil) if msg.match('<%=')
   end
-  return can_view, msg
+  cache_add(policy_id, can_view, msg)
 end
 
 ####################################################################
@@ -1098,25 +1064,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
 
@@ -1147,11 +1113,10 @@ end
 def dc_get_json_ld()
   return '' if @json_ld.nil? or @json_ld.size == 0
 
-  %Q[
+  %(
 <script type="application/ld+json">
 #{JSON.pretty_generate({'@context' => 'http://schema.org', '@graph' => @json_ld})}
-</script>
-].html_safe
+</script>).html_safe
 end
 
 ########################################################################
@@ -1175,12 +1140,12 @@ end
 # 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 << %(<link rel="canonical" href="#{@page.canonical_link}">\n  ) if @page&.canonical_link.present?
 
   html << @meta_tags.inject('') do |r, hash|
-    r << "<meta #{hash.first} content=\"#{hash.last}\">\n  "
+    r << %(<meta #{hash.first} content="#{hash.last}">\n  )
   end if @meta_tags
   html.html_safe
 end
@@ -1195,6 +1160,7 @@ end
 ########################################################################
 def dc_add_meta_tag(type, name, content)
   return if content.blank?
+
   @meta_tags ||= {}
   key = "#{type}=\"#{name}\""
   @meta_tags[key] = content
@@ -1213,7 +1179,7 @@ end
 # [String] alt="image-tag"
 #######################################################################
 def dc_img_alt_tag(file_name, text=nil)
-  " alt=\"#{dc_img_alt(file_name, text)}\" ".html_safe
+  %( alt="#{dc_img_alt(file_name, text)}" ).html_safe
 end
 
 #######################################################################
@@ -1229,9 +1195,17 @@ end
 # [String] alt_image_name
 #######################################################################
 def dc_img_alt(file_name, text=nil)
-  return text unless text.blank?
+  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
+def cache_add(id, can_view, msg)
+  @can_view_cache[id] = [can_view, msg]
 end
 
 

data/app/helpers/dc_category_helper.rb

@@ -0,0 +1,129 @@
+#--
+# Copyright (c) 2012+ 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.
+#++
+
+
+####################################################################
+# Helper for editing categories as tree view.
+####################################################################
+module DcCategoryHelper
+
+####################################################################
+#
+####################################################################
+def categories_as_tree
+  html = '<div id="catagories-as-tree"><ul><li data-id="nil"><span class="mi-o mi-home"></span>'
+  data = DcCategory.where(parent: nil).order_by(order: 1).to_a
+  html_for_category_tree(html, data)
+  (html << '</li></ul></div>' << js_for_category_tree).html_safe
+end
+
+private
+
+####################################################################
+#
+####################################################################
+def html_for_category_tree(html, data)
+  html << '<ul>'
+  data.each do |category|
+    icon = category.active ? 'check_box' : 'check_box_outline_blank'
+    html << %(<li id="#{category.id}" data-parent="#{category.parent}"><span class="mi-o mi-#{icon} mi-18"></span>#{category.name}\n)
+    children = DcCategory.where(parent: category.id).order_by(order: 1).to_a
+
+    html_for_category_tree(html, children) if children.size > 0
+    html << '</li>'
+  end
+  html << '</ul>'
+end
+
+####################################################################
+#
+####################################################################
+def js_for_category_tree
+  %(<script>
+$(function() {
+  $("#catagories-as-tree").jstree( {
+    core: { themes: { icons: false },
+            multiple: false
+          },
+    plugins: ["types", "contextmenu"],
+    contextmenu: {
+        items: function ($node) {
+            return {
+                edit: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.edit')}</span>",
+                    icon: "mi-o mi-edit",
+                    action: function (obj) {
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let params = "&ids=" + id;
+                        location.href = "/cmsedit/" + id + "/edit?t=dc_category&f=dc_category_as_tree" + params;
+                    }
+                },
+
+                new_child: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.new')}</span>",
+                    icon: "mi-o mi-plus",
+                    action: function (obj) {
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let params = "&ids=" + id + "&p_parent=" + id;
+                        location.href = "/cmsedit/new?t=dc_category&f=dc_category_as_tree" + params
+                    }
+                },
+
+                delete: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.delete')}</span>",
+                    icon: "mi-o mi-delete",
+                    action: function (obj) {
+                        if (confirmation_is_cancled("#{t('drgcms.confirm_delete')}") === true) return false;
+
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let id_return = $('#catagories-as-tree').jstree('get_selected', true)[0].data["parent"];
+
+                        $.ajax({
+                            url: "/cmsedit/" + id + "?t=dc_category",
+                            type: 'DELETE',
+                            success: function(data) {
+                              let error = data.match("#{I18n.t('drgcms.category_has_subs')}");
+                              if (error !== null) {
+                                alert(error[0]);
+                                params = "?t=dc_category&f=dc_category_as_tree&ids=" + id;
+                                location.href = "/cmsedit" + params;
+                                return true;
+                              }
+                            }
+                        });
+
+                        let params = "?t=dc_category&f=dc_category_as_tree&ids=" + id_return;
+                        location.href = "/cmsedit" + params;
+                    }
+                },
+            }
+          },
+       },
+    });
+    $("#catagories-as-tree").jstree(true).select_node("#{params[:ids]}");
+});
+
+</script>)
+end
+
+end