drg_cms 0.6.0.8 → 0.6.1.5

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: Mongoid::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

@@ -50,14 +50,14 @@ field :picture,     type: String
 field :birthdate,   type: Date
 field :about,       type: String
 field :last_visit,  type: Time
-field :active,      type: Boolean, default: true
+field :active,      type: Mongoid::Boolean, default: true
 field :valid_from,  type: Date
 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: Mongoid::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}".squish
+  # 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_big_table.rb

@@ -78,10 +78,10 @@ class DcBigTable
 ########################################################################
 # Will return possible choices for specified key prepared for usega in select input field.
 ########################################################################
-def self.choices4(key, site, locale=nil)
+def self.choices4(key, site = nil, locale = nil)
   result = []
   choices = find_by(key: key, site: site)
-  choices = find_by(key: key, site: nil) if choices.nil?
+  choices = find_by(key: key, site: nil) if site && choices.nil?
   if choices
     choices.dc_big_table_values.each do |choice| 
       description = choice.description

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. 

data/app/models/dc_filter.rb

@@ -106,8 +106,9 @@ end
 ############################################################################
 # Return filter input field for entering variable filter values on index form 
 ############################################################################
-def self.get_filter_field(parent) 
+def self.get_filter_field(parent)
   return '' if parent.session[ parent.form['table'] ].nil?
+
   filter = parent.session[ parent.form['table'] ][:filter]
   return '' if filter.nil?
 
@@ -115,8 +116,11 @@ def self.get_filter_field(parent)
   return '' if filter.nil?
 
   field = get_field_form_definition(filter['field'], parent)
-  return '' if field.nil? and filter['input'].nil?
-  field = {} if field.nil?
+  return '' if field.nil? && filter['input'].nil?
+
+  saved_readonly = parent.form['readonly']
+  parent.form['readonly'] = false # must be
+  field ||= {}
   # If field has choices available in labels, use them. This is most likely select input field.
   if field['name']
     choices = parent.t('helpers.label.' + parent.form['table'] + '.choices4_' + field['name'] )
@@ -129,35 +133,37 @@ def self.get_filter_field(parent)
   field['type']     = filter['input'] if filter['input'].to_s.size > 5
   field['type']   ||= 'text_field'
   field['readonly'] = false   # must be
-  field['html']   ||= {} 
-  field['html']['size']  = 20
+  field['html']   ||= {}
+  field['html']['size'] = 20
   # Start with last entered value
   field['html']['value']    = filter['value'] unless filter['value'] == '#NIL'
   field['html']['selected'] = field['html']['value'] # for select field
   # url for filter ON action
   field['html']['data-url'] = parent.url_for(
-    controller: 'cmsedit',action: :index, filter: 'on',
+    controller: 'cmsedit', action: :index, filter: 'on',
     table: parent.form['table'], form_name: parent.params['form_name'])
   url = field['html']['data-url']
   # remove if present
   field['with_new'] = nil if field['with_new']
-# create input field object
-  klas_string = field['type'].camelize
-  klas = DrgcmsFormFields::const_get(klas_string) rescue nil
-  return '' if klas.nil?
-# return data from object and create html code to display field
-  object = klas.new(parent, nil, field).render rescue nil
-  # Error. Forget filter and return 
-  if object.nil?
-    parent.session[ parent.form['table'] ][:filter] = nil
-    return ''
+  # create input field object
+  html = ''
+  klass_string = field['type'].camelize
+  klass = DrgcmsFormFields::const_get(klass_string) rescue nil
+  # return data from object and create html code to display field
+  if klass
+    if drg_field = klass.new(parent, nil, field).render rescue nil
+      js = drg_field.js.blank? ? '' : parent.javascript_tag(drg_field.js)
+      html = %(<li class="no-background">
+<span class="filter_field" data-url="#{url}">#{drg_field.html}
+  #{parent.fa_icon('search lg', class: 'record_filter_field_icon')}
+  #{js}</span></li>)
+    else
+      # Error. Forget filter
+      parent.session[ parent.form['table'] ][:filter] = nil
+    end
   end
-  js = object.js.blank? ? '' : parent.javascript_tag(object.js)
-%Q[<li class="no-background">
-<span class="filter_field" data-url="#{url}">#{object.html}
-#{parent.fa_icon('search lg', class: 'record_filter_field_icon')}
-#{js}</span>
-</li>]
+  parent.form['readonly'] = saved_readonly
+  html
 end
 
 ######################################################################

data/app/models/dc_key_value_store.rb

@@ -128,6 +128,7 @@ def self.set_value(value, *keys)
   else
     create(key:  keys.join('-'), value: value)
   end
+  value
 end
 
 end

data/app/models/dc_permission.rb

@@ -44,23 +44,23 @@ class DcPermission
 #- Available permissions settings
 
 # User has no access 
-NO_ACCESS     = 0 
+NO_ACCESS = 0
 # User can view documents
-CAN_VIEW      = 1 
+CAN_VIEW  = 1
 # User can create new documents  
-CAN_CREATE    = 2 
+CAN_CREATE = 2
 # User can edit his own documents
-CAN_EDIT      = 4 
+CAN_EDIT = 4
 # User can edit all documents in collection
-CAN_EDIT_ALL  = 8 
+CAN_EDIT_ALL = 8
 # User can delete his own documents
-CAN_DELETE    = 16 
+CAN_DELETE = 16
 # User can delete all documents in collection
 CAN_DELETE_ALL = 32
 # User can admin collection (same as can_delete_all, but can see documents which do not belong to current site)
-CAN_ADMIN     = 64 
+CAN_ADMIN = 64
 # User is superadmin. Basicly same as admin.
-SUPERADMIN    = 128 
+SUPERADMIN = 128
 
 include Mongoid::Document
 include Mongoid::Timestamps
@@ -75,7 +75,17 @@ embeds_many :dc_policy_rules, as: :policy_rules
 index( { table_name: 1 }, { unique: true } )    
 
 validates :table_name, presence: true
-validates :table_name, uniqueness: true  
+validates :table_name, uniqueness: true
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_permission)
+end
 
 ########################################################################
 # Will return choices for permissions prepared for usega in select input field.

data/app/models/dc_policy.rb

@@ -45,22 +45,33 @@
 # other policies. Default policy is also used when document has no access policy assigned.
 #########################################################################
 class DcPolicy
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field :name,        type: String
-  field :description, type: String,  default: ''
-  field :is_default,  type: Boolean, default: false
-  field :active,      type: Boolean, default: true
-  field :updated_by,  type: BSON::ObjectId
-  field :message,     type: String,  default: ''
-  
-  embeds_many :dc_policy_rules, as: :policy_rules  
-  embedded_in :dc_site
+field :name,        type: String
+field :description, type: String,  default: ''
+field :is_default,  type: Boolean, default: false
+field :active,      type: Boolean, default: true
+field :updated_by,  type: BSON::ObjectId
+field :message,     type: String,  default: ''
+
+embeds_many :dc_policy_rules, as: :policy_rules
+embedded_in :dc_site
+
+validates :name, length: { minimum: 4 }
+validates :message, length: { minimum: 5 }
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_permission)
+  DrgCms.cache_clear(:dc_site)
+end
 
-  validates :name, :length => { :minimum => 4 }  
-  validates :message, :length => { :minimum => 5 }  
-  
 =begin  
 #########################################################################
 # Returns values for permissions ready to be used in select field.

data/app/models/dc_policy_role.rb

@@ -38,18 +38,29 @@
 # which can be persistent, when application is used as Rails plugin. 
 #########################################################################
 class DcPolicyRole
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field   :name,        type: String
-  field   :system_name, type: String
-  field   :active,      type: Boolean, default: true  
-  
-  index( { name: 1 }, { unique: true } )
-  index( system_name: 1 )
-  
-  validates :name, :length => { :minimum => 4 }  
-  validates :name, uniqueness: true    
+field   :name,        type: String
+field   :system_name, type: String
+field   :active,      type: Boolean, default: true
+
+index( { name: 1 }, { unique: true } )
+index( system_name: 1 )
+
+validates :name, :length => { :minimum => 4 }
+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_permission)
+  DrgCms.cache_clear(:dc_site)
+end
 
 ########################################################################
 # Return all defined roles as choices for use in select field.

data/app/models/dc_temp.rb

@@ -46,7 +46,7 @@ class DcTemp
 ########################################################################
 def initialize(parms = {})
   super()
-  parms.stringify_keys!
+  parms = parms.nil? ? {} : parms.stringify_keys
   self.key    = parms.delete('key')  if parms['key']
   self.active = parms.delete('active') if parms['active']
   self.order  = parms.delete('order') if parms['order']
@@ -137,4 +137,11 @@ def self.prepare(key:, clear: nil)
   self.where(key: key) 
 end
 
+########################################################################
+# Order data by new key. Will update order field with values from new field
+########################################################################
+def self.reorder_by(key, new_order)
+  self.where(key: key).each { |doc| doc.order = data[key]; doc.save }
+end
+
 end

data/app/models/dc_user_role.rb

@@ -57,8 +57,8 @@ class DcUserRole
 # Determine of role is still active
 ###############################################################################
 def active?
-  now = Time.zone.local
-  self.active and (self.valid_from.nil? or now > self.valid_from) and (self.valid_to.nil? or now < self.valid_to)
+  now = Time.current
+  active && (valid_from.nil? || now > valid_from) && (valid_to.nil? || now < valid_to)
 end
 
 end

data/app/models/drgcms_form_fields/comment.rb

@@ -31,12 +31,17 @@ module DrgcmsFormFields
 # * +type:+ comment (required)
 # * +caption:+ Caption text written in label place. If set to false comment 
 # will occupy whole row. (required)
-# 
+# * +html:+ Optional html attributes will be added to div surrounding the comment.
+#
 # Form example:
 #    30:
 #      type: comment
 #      text: myapp.comment_text
 #      caption: false
+#      html:
+#        style: 'color: red'
+#        class: some_class
+#        id: some_id
 ###########################################################################
 class Comment < DrgcmsField
   
@@ -45,7 +50,11 @@ class Comment < DrgcmsField
 ###########################################################################
 def render
   comment = @yaml['comment'] || @yaml['text']
-  @html << "<div class=\"dc-comment\">#{t(comment, comment).gsub("\n",'<br>')}</div>"
+  @yaml['html'] ||= {}
+  @yaml['html']['class'] = 'dc-comment ' + @yaml['html']['class'].to_s
+  html = @yaml['html'].inject('') { |r, e| r << %( #{e[0]}="#{e[1]}") }
+
+  @html << %(<div #{html}>#{t(comment, comment).gsub("\n",'<br>')}</div>)
   self
 end
 end

data/app/models/drgcms_form_fields/date_picker.rb

@@ -78,6 +78,8 @@ def render
   @yaml['options']['lang']   ||= "'#{I18n.locale}'"
   @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.date')}'"
   @yaml['options']['timepicker'] = false
+  @yaml['options']['scrollMonth'] ||= false
+  @yaml['options']['scrollInput'] ||= false
 
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -135,7 +135,8 @@ def ro_standard(value=nil)
       @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
     end
   end
-  @html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
+  #@html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
+  @html << %(<div id="#{@yaml['name']}" class="dc-readonly">#{value}</div>)
   self
 end