drg_cms 0.5.50.2 → 0.5.51.1

data/app/forms/dc_simple_menu.yml

@@ -52,6 +52,12 @@ form:
         type: text_field
         html:
           size: 20
+      50:
+        name: dc_site_id
+        type: select
+        eval: DcSite.choices4_site
+        html:
+          include_blank: true
 
     tab2:
       10:

data/app/forms/dc_site.yml

@@ -133,6 +133,12 @@ form:
     5permissions:        
 
       10:
+        name: inherit_policy
+        type: select
+        eval: DcSite.choices4_site
+        html:
+          include_blank: true
+      20:
         name: dc_policies
         type: embedded
         formname: dc_policy

data/app/helpers/cmsedit_helper.rb

@@ -411,7 +411,7 @@ def dc_columns_for_result(document)
 # as field        
     elsif document.respond_to?(v['name'])
       dc_format_value(document.send( v['name'] ), v['format']) 
-# as hash (dc_dummy)
+# as hash (dc_memory)
     elsif document.class == Hash 
       document[ v['name'] ]
 # error
@@ -589,13 +589,17 @@ end
 ############################################################################
 # Create background div and table definitions for result set.
 ############################################################################
-def dc_background_for_result
-  html = '<div class="dc-result-div" ' 
-  html << (@form['result_set']['table_style'] ? "style=\"overflow-x: scroll;\" >" : '>')
-  html << "\n"  
-#
-  html << "<table class=\"dc-result #{@form['result_set']['table_class']}\" "
-  html << (@form['result_set']['table_style'] ? "style=\"#{@form['result_set']['table_style']}\" >" : '>')
+def dc_background_for_result(start)
+  if start == :start
+    html = '<div class="dc-result-div" ' 
+    html << (@form['result_set']['table_style'] ? "style=\"overflow-x: scroll;\" >" : '>')
+    html << "\n"  
+  #
+    html << "<table class=\"dc-result #{@form['result_set']['table_class']}\" "
+    html << (@form['result_set']['table_style'] ? "style=\"#{@form['result_set']['table_style']}\" >" : '>')
+  else
+    html = '</table></div>'
+  end
   html.html_safe
 end
 

data/app/helpers/dc_application_helper.rb

@@ -65,7 +65,7 @@ end
 # find where the message is comming from.
 ############################################################################
 def dc_deprecate(msg)
-  p "#{dc_get_site.name}: #{msg}"
+  logger.info "#{dc_get_site.name}: #{msg}"
 end
 
 ############################################################################
@@ -154,8 +154,6 @@ def dc_render_from_site(opts={})
   render(inline: design, layout: opts[:layout], with: opts[:with])
 end
 
-
-
 ########################################################################
 # Used for designs with lots of common code and one (or more) part which differs.
 # Point is to define design once and replace some parts of design dinamically.
@@ -172,13 +170,24 @@ end
 # This helper is replacement dc_render_from_site method which will soon be deprecated. 
 ########################################################################
 def dc_render_design_part(part) 
-  if part.nil?
-    ''
-  elsif part.class == Proc
+  case
+  when part.nil? then ''
+# Send as array. Part may be defined with options on page. First element has
+# name of element which defines what to do. If not defined default behaviour is 
+# called. That is what is defined in second part of array.
+  when part.class == Array then
+    if @options.dig(:settings, part.first)
+      #TODO to be defined 
+    else  
+      result = part.last.call
+      result.class == Array ? result.first : result
+    end
+  when part.class == Proc then
     result = part.call
     result.class == Array ? result.first : result
-  elsif part.class == String
-    eval part
+# Send as string. Evaluate content of string    
+  when part.class == String then eval part
+# For future maybe. Just call objects to_s method.
   else
     part.to_s
   end.html_safe
@@ -188,6 +197,26 @@ def dc_render_design(part)
   dc_render_design_part(part) 
 end
 
+############################################################################
+# This is main method used for render parts of design into final HTML document.
+# 
+# Parameters:
+# [renderer] String or Symbol. Class name (in lowercase) that will be used to render final HTML code. 
+# If class name is provided without '_renderer' suffix it will be added automatically.
+# 
+# When renderer has value :part, it is a shortcut for dc_render_design_part method which
+# is used to draw parts of layout on design.
+# 
+# [opts] Hash. Additional options that are passed to method. Options are merged with
+# options set on site, design, page and passed to renderer object.
+# 
+# Example:
+#    <%= dc_render(:dc_page, method: 'view', category: 'news') %>
+############################################################################
+def dc_render_partial(opts={})
+  _origin.render(partial: opts[:partial], formats: [:html], locals: opts[:locals])
+end
+
 ########################################################################
 # Helper for rendering top CMS menu when in editing mode
 ########################################################################
@@ -206,6 +235,7 @@ end
 def dc_page_bottom()
   %Q[<style type="text/css">#{@css}</style>#{javascript_tag @js}].html_safe
 end
+
 ############################################################################
 # Creates title div for DRG CMS dialogs. Title may also contain pagination section on right side if 
 # result_set is provided as parameter.
@@ -265,6 +295,11 @@ def dc_new_title()
     t( title['new'], title['new'] )
   else
     if @form['table'] == 'dc_dummy'
+      dc_deprecate('dc_dummy will be deprecated. Use dc_memory instead.')
+      @form['table'] = 'dc_memory'
+    end
+# in memory variables    
+    if @form['table'] == 'dc_memory'
       t( @form['title'], @form['title'] )
     else
       "#{t('drgcms.new')} : #{t_tablename(@form['table'])}"    
@@ -441,7 +476,7 @@ def dc_link_for_create(opts)
   title = opts.delete('title') #
   title = t(title, title) if title
   target = opts.delete('target')  || 'iframe_cms'
-  opts['form_name']  ||= opts['table']
+  opts['formname']   ||= opts['table'].split(';').last
   opts['action']       = 'new'
   opts['controller'] ||= 'cmsedit'
   js = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
@@ -453,8 +488,9 @@ end
 # Will create HTML code required to edit document.
 # 
 # Parameters: 
-# [opts] Hash. Optional parameters for url_for helper. These options must provide at least table and formname
-# and id parameters. 
+# [opts] Hash. Optional parameters for url_for helper. These options must provide 
+# at least table, formname and id parameters. Optional title, target and icon parameters
+# can be set.
 # 
 # Example:
 #    html << dc_link_for_edit( @options ) if @opts[:edit_mode] > 1
@@ -465,12 +501,14 @@ end
 def dc_link_for_edit(opts)
   opts.stringify_keys!  
   title  = opts.delete('title') #
+  title  = t(title)
   target = opts.delete('target') || 'iframe_cms'
+  icon   = opts.delete('icon') || 'edit lg'
   opts['controller'] ||= 'cmsedit'
-  opts['action']       = 'edit'
-  opts['form_name']  ||= opts['table']
+  opts['action']     ||= 'edit'
+  opts['formname']   ||= opts['table'].split(';').last
   js  = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
-  dc_link_to(nil, _origin.fa_icon('edit lg', class: 'dc-inline-link'), '#', 
+  dc_link_to(nil, _origin.fa_icon(icon, class: 'dc-inline-link'), '#', 
              { onclick: js, title: title, alt: 'Edit'})
 end
 
@@ -518,6 +556,7 @@ end
 # String. HTML code required for manipulation of currently processed document.
 ########################################################################
 def dc_page_edit_menu(opts=@opts)
+  opts[:edit_mode] ||= _origin.session[:edit_mode]
   return '' if opts[:edit_mode] < 2
 # save some data to cookie. This can not go to session.
   page  = opts[:page] || @page
@@ -530,6 +569,7 @@ def dc_page_edit_menu(opts=@opts)
   }
   _origin.cookies[:record] = Marshal.dump(kukis)
   title = "#{t('drgcms.edit')}: #{page.subject}"
+  opts[:editparams] ||= {}
   dc_link_menu_tag(title) do |html|
     opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', 'icon' => 'edit' )
     opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_table, formname: opts[:formname], edit_only: 'body' )
@@ -546,7 +586,7 @@ def dc_page_edit_menu(opts=@opts)
     opts[:editparams].merge!(ids: page.id, formname: 'dc_part', 'icon' => 'plus-square-o', 
                              table: "#{_origin.site.page_table};dc_part"  )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_part') )
-  end
+  end.html_safe
 end
 
 ########################################################################
@@ -562,9 +602,26 @@ end
 #      eval: 'dc_page_class.all_pages_for_site(@parent.dc_get_site)'
 ########################################################################
 def dc_page_class()
-  dc_get_site.page_class.classify.constantize  
+#  dc_get_site.page_class.classify.constantize  
+  dc_get_site.page_table.classify.constantize
 end
 
+########################################################################
+# Return menu class model defined in site document menu_class field. 
+# 
+# Used in forms for providing menus class to the forms object.
+# 
+# Example as used on form:
+#    30:
+#      name: menu_id
+#      type: tree_view
+#      eval: 'dc_menu_class.all_menus_for_site(@parent.dc_get_site)'
+########################################################################
+def dc_menu_class()
+  dc_get_site.menu_class.classify.constantize
+end
+
+
 ####################################################################
 # Wrapper for i18 t method, with some spice added. If translation is not found English
 # translation value will be returned. And if still not found default value will be returned if passed.
@@ -984,6 +1041,11 @@ def dc_user_can_view(ctrl, policy_id)
 #
   site = ctrl.site
   policies = site.dc_policies
+  policies = if site.inherit_policy.blank? 
+    site.dc_policies
+  else
+    Mongoid::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) }
   return false, 'Default accsess policy not found for the site!' unless default_policy
@@ -1004,7 +1066,6 @@ def dc_user_can_view(ctrl, policy_id)
     ctrl.session[:user_roles] = [role.id]
   end
 # Check if user has any role that allows him to view part
-#  p h, ctrl.session[:user_roles]
   can_view, msg = false,''
   ctrl.session[:user_roles].each do |role|
     next unless permissions[role]          # role not yet defined. Will die in next line.
@@ -1148,7 +1209,7 @@ end
 # Html code for edit iframe
 ########################################################################
 def dc_iframe_edit(table, opts={})
-  ret = if params.size > 2 and table  # controller, action, path is minimal
+  ret = if params.to_unsafe_h.size > 2 and table  # controller, action, path is minimal
     params[:controller] = 'cmsedit'
     params[:action]     = (params[:oper] and (params[:oper] == 'edit')) ? 'edit' : 'index'
     params[:action]     = opts[:action] unless params[:oper]

data/app/helpers/dc_menu_renderer.rb

@@ -50,7 +50,11 @@ end
 # Return selected topmenu level.
 ########################################################################
 def find_selected
-  ret = @menu.dc_menu_items.find( @parent.page.menu_id ) if @parent.page.menu_id
+  if @parent.page.menu_id
+    top_menu_id = @parent.page.menu_id
+    top_menu_id = @parent.page.menu_id.split(';')[1] if @parent.page.menu_id.match(';')
+    ret = @menu.dc_menu_items.find(top_menu_id)
+  end
 # return first if not found (something is wrong)
   ret ||= @menu.dc_menu_items[0]
 end
@@ -128,6 +132,7 @@ def do_menu_level(menu, options={})
         opts = options.clone
         opts['ids']   = (opts['ids']   ? "#{opts['ids']};" : '')   + menu._id.to_s
         opts['table'] = (opts['table'] ? "#{opts['table']};" : '') + 'dc_menu_item'
+        opts['formname'] = nil # must be
       end
       html << do_menu_level(item, opts)
     end

data/app/helpers/dc_part_renderer.rb

@@ -97,7 +97,7 @@ def load_parts #:nodoc:
     type = decamelize_type(part._type) || 'dc_part'
     @parent.parts << [part, @parent.page.id, type, "#{@parent.site.page_table};#{type}"]
   end
-# add parts in page
+# add parts in site
   @parent.site.dc_parts.where(active: true).each do |part|
     type = decamelize_type(part._type) || 'dc_part'
     @parent.parts << [part, @parent.site.id, type, "dc_site;#{type}"]

data/app/models/concerns/dc_page_concern.rb

@@ -0,0 +1,133 @@
+#coding: utf-8
+#--
+# 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.
+#++
+
+#########################################################################
+# ActiveSupport::Concern definition for DcPage class. 
+#########################################################################
+module DcPageConcern
+extend ActiveSupport::Concern
+included do
+  
+include Mongoid::Document
+include Mongoid::Timestamps
+
+field :subject,      type: String,  default: ''
+field :title,        type: String
+field :subject_link, type: String,  default: ''
+field :alt_link,     type: String,  default: ''
+field :sub_subject,  type: String,  default: ''
+field :picture,      type: String   
+field :gallery,      type: String   
+field :body,         type: String,  default: ''
+field :css,          type: String,  default: ''
+field :script,       type: String,  default: ''
+field :params,       type: String
+field :menu_id,      type: String
+field :author_id,    type: BSON::ObjectId
+field :dc_poll_id,   type: BSON::ObjectId
+field :author_name,  type: String
+field :publish_date, type: DateTime
+field :user_name,    type: String
+field :valid_from,   type: DateTime
+field :valid_to,     type: DateTime
+field :comments,     type: Integer, default: 1  # 0 => not allowed, 1 => allowed
+field :active,       type: Boolean, default: true 
+field :created_by,   type: BSON::ObjectId
+field :updated_by,   type: BSON::ObjectId
+field :kats,         type: Array         # Categories
+
+field :policy_id,    type: BSON::ObjectId
+
+embeds_many :dc_parts
+
+belongs_to  :dc_site #,   optional: true
+belongs_to  :dc_design #, optional: true
+
+index  ({ dc_site_id: 1, subject_link: 1 })
+index  kats: 1
+index  alt_link:  1
+
+before_save :do_before_save
+
+validates :publish_date, presence: true
+  
+######################################################################
+protected
+
+######################################################################
+# Implementation of before_save callback.
+######################################################################
+def do_before_save
+  if self.subject_link.empty?
+    self.subject_link = DcPage.clear_link(self.subject.downcase.strip) 
+    # add id to link, but only if something is written in subject   
+    self.subject_link << "-#{self.id.to_s}" if self.subject_link.size > 1 
+  end
+# menu_id is returned as string Array class if entered on form as tree_select object.
+  self.menu_id = self.menu_id.scan(/"([^"]*)"/)[0][0] if self.menu_id.to_s.match('"')
+end
+
+######################################################################
+# Clears subject link of chars that shouldn't be there and also takes care 
+# than link size is not larger than 100 chars.
+######################################################################
+def self.clear_link(link)
+  link.gsub!(/\.|\?|\!\&|»|«|\,|\"|\'|\:/,'')
+  link.gsub!('<br>','')
+  link.gsub!('–','-')
+  link.gsub!(' ','-')
+  link.gsub!('---','-')
+  link.gsub!('--','-')
+# it shall not be greater than 100 chars. Don't break in the middle of words  
+  if link.size > 100
+    link = link[0,100]
+    link.chop! until link[-1,1] == '-' or link.size < 10 # delete until -
+  end
+  link.chop! if link[-1,1] == '-' # remove - at the end
+  link
+end
+
+######################################################################
+# Return all pages belonging to site ready for select input field. Used
+# by dc_menu* forms, for selecting page which will be linked by menu option.
+# 
+# Parameters:
+# [site] Site document.
+######################################################################
+def self.all_pages_for_site(site)
+  only(:subject, :subject_link).where(dc_site_id: site._id, active: true).order(subject: 1).
+    inject([]) { |r,page| r << [ page.subject, page.subject_link] }
+end
+
+########################################################################
+# Return filter options
+########################################################################
+def self.dc_filters
+  {'title' => 'drgcms.filters.this_site_only', 'operation' => 'eq', 
+   'field' => 'dc_site_id', 'value' => '@current_site'}
+end
+
+end
+
+end

data/app/models/concerns/dc_piece_concern.rb

@@ -0,0 +1,57 @@
+#--
+# 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.
+#++
+
+
+#########################################################################
+# ActiveSupport::Concern definition for DcPiece class. 
+#########################################################################
+module DcPieceConcern
+  extend ActiveSupport::Concern
+  included do
+  
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :name,          type: String,  default: ''
+  field :description,   type: String,  default: ''
+  field :picture,       type: String   
+  field :thumbnail,     type: String   
+  field :body,          type: String,  default: ''
+  field :css,           type: String,  default: ''
+  field :script,        type: String,  default: ''
+  field :script_type,   type: String,  default: ''
+  field :params,        type: String,  default: ''
+  field :piece_id,      type: BSON::ObjectId
+  field :div_id,        type: String
+  field :site_id,       type: BSON::ObjectId
+  field :order,         type: Integer, default: 0
+  field :active,        type: Boolean, default: true  
+  field :valid_from,    type: DateTime
+  field :valid_to,      type: DateTime
+  
+  field :created_by,    type: BSON::ObjectId
+  field :updated_by,    type: BSON::ObjectId  
+  
+  validates :name, presence: true
+  end
+end