drg_cms 0.6.0.8 → 0.6.1.0

data/app/helpers/dc_application_helper.rb

@@ -243,8 +243,8 @@ end
 # Helper for adding additional css and javascript code added by documents
 # and renderers during page rendering.
 ########################################################################
-def dc_page_bottom()
-  %Q[<style type="text/css">#{@css}</style>#{javascript_tag @js}].html_safe
+def dc_page_bottom
+  %(<style type="text/css">#{@css}</style>#{javascript_tag @js}).html_safe
 end
 
 ############################################################################
@@ -258,10 +258,16 @@ end
 # Returns:
 # String. HTML code for title.
 ############################################################################
-def dc_table_title(text, result_set=nil)
-  c = %Q[<div class="dc-title">#{text}]
+def dc_table_title(text, result_set = nil)
+  c = %(<div class="dc-title">#{text})
+  # help button
+  type = result_set.nil? ? 'form' : 'index'
+  form_name = params[:form_name] || params[:table]
+  url = url_for(controller: :dc_common, action: :help, type: type, form_name: form_name)
+  c << %(<div class="dc-help dc-link-ajax" data-url=#{url}>#{fa_icon('question-circle')}</div>)
+
   if result_set and result_set.respond_to?(:current_page)
-    c << %Q[<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no', filter: nil})}</div>]
+    c << %(<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no', filter: nil})}</div>)
   end
   c << '<div style="clear: both;"></div></div>'
   c.html_safe
@@ -273,7 +279,7 @@ end
 # Returns:
 # String. HTML code for title.
 ############################################################################
-def dc_edit_title()
+def dc_edit_title
   session[:form_processing] = "form:title:"
   title = @form['form']['title']
 # defined as form:title:edit
@@ -1083,12 +1089,13 @@ def dc_iframe_edit(table, opts={})
 end
 
 ########################################################################
-# Will return value from internal DRG variables.
-# This objects can be params, session, ...
+# Will return value from Rails and DRG internal objects.
+# This objects can be params, session, record, site, page
 # 
 # Parameters:
-# [object] String: Internal object holding variable. Current values can be session, params, site, page, class
+# [object] String: Internal object holding variable. Possible values are session, params, record, site, page, class
 # [var_name] String[symbol]: Variable name (:user_name, 'user_id', ...)
+# [current_document] Object: If passed and object is 'record' then it will be used for retrieving data.
 # 
 # Example:
 #    # called when constructing iframe for display
@@ -1100,26 +1107,28 @@ end
 #    
 # 
 # Returns:
-# Value of variable or nil when not found
+# Value of variable or error when not found
 ########################################################################
-def dc_internal_var(object, var_name)
+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 _origin.record.send(var_name)
-      when object == 'class'   then
-        clas, method_name = var_name.split('.')
-        klas = clas.classify.constantize
-        # call method. Error will be cought below.
-        klas.send(method_name)
-      else
-        'VARIABLE: UNKNOWN OBJECT'
+    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
+      current_document ? current_document.send(var_name) : _origin.record.send(var_name)
+    when object == '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'
     end
   rescue Exception => e
-    logger.error "Method dc_internal_var. Runtime error. #{e.message}"
+    Rails.logger.debug "\ndc_internal_var. Runtime error. #{e.message}\n"
+    Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
     'VARIABLE: ERROR'
   end
 end

data/app/models/concerns/dc_page_concern.rb

@@ -1,4 +1,3 @@
-#coding: utf-8
 #--
 # Copyright (c) 2012+ Damjan Rems
 #
@@ -83,6 +82,16 @@ before_save :do_before_save
 
 validates :publish_date, presence: true
 validate  :validate_images_alt_present
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_page)
+end
   
 ######################################################################
 # Will return subject_link. Field name link should be common for all documents
@@ -94,7 +103,7 @@ end
    
 ######################################################################
 # Will return validation error if all images in body field do not have 
-# alt attribute pressent.
+# alt attribute present.
 ######################################################################
 def validate_images_alt_present
   errors.add('body', I18n.t('drgcms.img_alt_not_present')) unless DcPage.images_alt_present?(self.body)

data/app/models/concerns/dc_policy_rule_concern.rb

@@ -25,17 +25,20 @@
 # ActiveSupport::Concern definition for DcPolicyRule class. 
 #########################################################################
 module DcPolicyRuleConcern
-  extend ActiveSupport::Concern
-  included do
+extend ActiveSupport::Concern
+included do
 
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  belongs_to :dc_policy_role
+belongs_to :dc_policy_role
 
-  field      :permission,    type: Integer, default: 0
+field      :permission,    type: Integer, default: 0
 
-  embedded_in :policy_rules, polymorphic: true 
+embedded_in :policy_rules, polymorphic: true
+
+after_save :cache_clear
+after_destroy :cache_clear
 
 #########################################################################
 # Returns values for permissions ready to be used in select field.
@@ -50,7 +53,7 @@ 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.split(',').inject([]) {|r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
+  c.split(',').inject([]) { |r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
 end
 
 #########################################################################
@@ -74,5 +77,14 @@ def self.permission_name_for_value(value)
   'error'
 end
 
+private
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  _parent.send(:cache_clear) if _parent.respond_to?(:cache_clear)
+end
+
 end
 end

data/app/models/concerns/dc_site_concern.rb

@@ -27,44 +27,55 @@
 module DcSiteConcern
 extend ActiveSupport::Concern
 included do
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :name,                type: String
-  field :description,         type: String
-  field :homepage_link,       type: String
-  field :error_link,          type: String
-  field :header,              type: String, default: ''
-  field :css,                 type: String, default: ''
-  field :route_name,          type: String, default: ''
-  field :page_title,          type: String  
-  field :document_extension,  type: String  
-  field :page_table,          type: String
-  field :page_class,          type: String, default: 'DcPage'
-  field :site_layout,         type: String, default: 'content'
-  field :menu_class,          type: String, default: 'DcSimpleMenu'
-  field :request_processor,   type: String
-  field :files_directory,     type: String
-  field :logo,                type: String
-  field :active,              type: Boolean, default: true
-  field :created_by,          type: BSON::ObjectId
-  field :updated_by,          type: BSON::ObjectId  
-  field :menu_name,           type: String
-  field :menu_id,             type: BSON::ObjectId
-  field :settings,            type: String
-  field :alias_for,           type: String  
-  field :rails_view,          type: String,  default: ''
-  field :design,              type: String,  default: ''
-  field :inherit_policy,      type: BSON::ObjectId 
-  
-  embeds_many :dc_policies
-  embeds_many :dc_parts
-  
-  index( { name: 1 }, { unique: true } )
-  index( { alias_for: 1 } )
-  
-  validates :name, presence: true
-  validates :name, uniqueness: true      
+
+include Mongoid::Document
+include Mongoid::Timestamps
+
+field :name,                type: String
+field :description,         type: String
+field :homepage_link,       type: String
+field :error_link,          type: String
+field :header,              type: String, default: ''
+field :css,                 type: String, default: ''
+field :route_name,          type: String, default: ''
+field :page_title,          type: String
+field :document_extension,  type: String
+field :page_table,          type: String
+field :page_class,          type: String, default: 'DcPage'
+field :site_layout,         type: String, default: 'content'
+field :menu_class,          type: String, default: 'DcSimpleMenu'
+field :request_processor,   type: String
+field :files_directory,     type: String
+field :logo,                type: String
+field :active,              type: Boolean, default: true
+field :created_by,          type: BSON::ObjectId
+field :updated_by,          type: BSON::ObjectId
+field :menu_name,           type: String
+field :menu_id,             type: BSON::ObjectId
+field :settings,            type: String
+field :alias_for,           type: String
+field :rails_view,          type: String,  default: ''
+field :design,              type: String,  default: ''
+field :inherit_policy,      type: BSON::ObjectId
+
+embeds_many :dc_policies
+embeds_many :dc_parts
+
+index( { name: 1 }, { unique: true } )
+index( { alias_for: 1 } )
+
+validates :name, presence: true
+validates :name, uniqueness: true
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_site)
+end
 
 ########################################################################
 # Returns value of site setting. If no value is send as parameter it returns 
@@ -78,14 +89,14 @@ end
 ########################################################################
 # Returns class object of collection name
 ########################################################################
-def page_klass()
+def page_klass
   (self.page_table.blank? ? self.page_class : self.page_table).classify.constantize
 end
 
 ########################################################################
 # Returns class object of menu collection name
 ########################################################################
-def menu_klass()
+def menu_klass
   (menu_class.blank? ? 'DcMenu' : menu_class).classify.constantize
 end
 
@@ -99,12 +110,13 @@ end
 
 ########################################################################
 # Return choices for selecting policies for the site
+# @deprecated
 ########################################################################
-def self.choices4_policies
-  site = ApplicationController.dc_get_site_()
+#def self.choices4_policies
+#  site = ApplicationController.dc_get_site_()
   #all.inject([]) { |r,site| r << [ (site.active ? '' : t('drgcms.disabled') ) + site.name, site._id] }
-  [['a','b']]
-end
+#  [['a','b']]
+#end
 
 ########################################################################
 # Return choices for selecting policies for the site

data/app/models/concerns/dc_user_concern.rb

@@ -56,8 +56,8 @@ field :valid_to,    type: Date
 field :created_by,  type: BSON::ObjectId
 field :updated_by,  type: BSON::ObjectId
 
-field :type,        type: Integer, default: 0 # 0 => User, 1 => Group
-field :members,     type: Array
+field :group,       type: Boolean, default: false # false => User, true => Group
+field :member,      type: Array
 
 embeds_many :dc_user_roles
 
@@ -73,23 +73,17 @@ has_secure_password
 
 index( { username: 1 }, { unique: true } )
 index( { email: 1 }, { unique: true } )
-index 'dc_user_roles.dc_policy_role_id' => 1  
-index 'members' => 1  
+index 'dc_user_roles.dc_policy_role_id' => 1
+index member: 1
+index group: 1
 
 validates_length_of :username, minimum: 4
 validates           :username, uniqueness: true  
-validates           :email,    uniqueness: true  
-before_save :do_before_save
+validates           :email,    uniqueness: true
+validate :do_validate
 
-##########################################################################
-# before_save callback takes care of name field and ensures that e-mail is unique 
-# when entry is left empty. 
-##########################################################################
-def do_before_save
-  self.name  = "#{self.title} #{self.first_name} #{self.middle_name + ' ' unless self.middle_name.blank?}#{self.last_name}".strip
-# to ensure unique e-mail            
-  self.email = "unknown@#{self.id}" if self.email.to_s.strip.size < 5
-end
+before_save :do_before_save
+before_validation :do_before_validation
 
 ##########################################################################
 # Checks if user has role 'role_id' defined in his roles.
@@ -98,7 +92,7 @@ end
 ##########################################################################
 def has_role?(role_id)
   return false unless role_id
-#
+
   unless BSON::ObjectId.legal?(role_id)
     role    = DcPolicyRole.get_role(role_id)
     role_id = role.id if role
@@ -111,7 +105,7 @@ end
 # Will return all possible values for country field ready for input in select field. 
 # Values are loaded from github when method is first called.
 ##########################################################################
-def self.choices4_country()
+def self.choices4_country
   if @@countries.nil?
     uri = URI.parse("https://raw.githubusercontent.com/umpirsky/country-list/master/country/cldr/en/country.json")
     http = Net::HTTP.new(uri.host, uri.port)
@@ -125,7 +119,7 @@ def self.choices4_country()
 end
 
 ##########################################################################
-# Performs ligically test on passed email parameter.
+# Performs logically test on passed email parameter.
 # 
 # Parameters:
 # [email] String: e-mail address
@@ -143,5 +137,50 @@ def self.is_email?(email)
   email.to_s =~ /^[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/
 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] }
+end
+
+private
+
+##########################################################################
+# before_save callback takes care of name field and ensures that e-mail is unique
+# when entry is left empty.
+##########################################################################
+def do_before_save
+  self.name  = "#{title} #{first_name} #{middle_name + ' ' unless middle_name.blank?}#{last_name}".strip
+  # to ensure unique e-mail
+  self.email = "unknown@#{id}" if email.blank?
+end
+
+##########################################################################
+# Create random password for groups. Must be done before validation
+##########################################################################
+def do_before_validation
+  if new_record? && group
+    self.password = DcUser.random_password(30)
+    self.password_confirmation = password
+  end
+end
+
+##########################################################################
+# Perform some additional validations
+##########################################################################
+def do_validate
+  if group && member.present?
+    errors.add('member', I18n.t('errors.messages.present'))
+  end
+end
+##########################################################################
+# Will create random password
+##########################################################################
+def self.random_password(number)
+  charset = Array('A'..'Z') + Array('0'..'9') + Array('a'..'z')
+  Array.new(number) { charset.sample }.join
+end
+
 end
 end

data/app/models/dc_design.rb

@@ -87,25 +87,35 @@
 #    <style type="text/css"><%= @css.html_safe %></style><%= javascript_tag @js %>
 ########################################################################
 class DcDesign
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field   :description, type: String,  default: ''
-  field   :body,        type: String,  default: ''
-  field   :css,         type: String,  default: ''
-  field   :rails_view,  type: String,  default: ''
-  field   :control,     type: String,  default: ''
-  field   :params,      type: String,  default: ''
-  field   :control_method,  type: String,  default: ''
-  field   :author,      type: String
-  field   :active,      type: Boolean, default: true 
-  field   :created_by,  type: BSON::ObjectId
-  field   :updated_by,  type: BSON::ObjectId
-  field   :site_id,     type: BSON::ObjectId
-  
-  embeds_many :dc_parts
-  
-  validates_length_of :description, minimum: 5
+include Mongoid::Document
+include Mongoid::Timestamps
+
+field   :description, type: String,  default: ''
+field   :body,        type: String,  default: ''
+field   :css,         type: String,  default: ''
+field   :rails_view,  type: String,  default: ''
+field   :control,     type: String,  default: ''
+field   :params,      type: String,  default: ''
+field   :control_method,  type: String,  default: ''
+field   :author,      type: String
+field   :active,      type: Boolean, default: true
+field   :created_by,  type: BSON::ObjectId
+field   :updated_by,  type: BSON::ObjectId
+field   :site_id,     type: BSON::ObjectId
+
+embeds_many :dc_parts
+
+validates_length_of :description, minimum: 5
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_design)
+end
   
 ########################################################################
 # Return choices for select for design_id.