drg_cms 0.5.52.16 → 0.6.1.0

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_poll.rb

@@ -51,26 +51,46 @@
 # as DcSimpleItem embedded structure or as DRG CMS form YAML style entered into form field.
 ########################################################################
 class DcPoll
-  include Mongoid::Document
-  include Mongoid::Timestamps
+  
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field :name,          type: String, default: ''
-  field :title,         type: String, default: ''
-  field :sub_text,      type: String, default: ''
-  field :pre_display,   type: String
-  field :operation,     type: String
-  field :parameters,    type: String
-  field :display,       type: String, default: '1'
-  field :css,           type: String
-  field :form,          type: String
-  field :valid_from,    type: DateTime
-  field :valid_to,      type: DateTime
-  field :captcha_type,  type: String
-  field :active,        type: Boolean, default: true 
-  field :created_by,    type: BSON::ObjectId
-  field :updated_by,    type: BSON::ObjectId
+field :name,          type: String, default: ''
+field :title,         type: String, default: ''
+field :sub_text,      type: String, default: ''
+field :pre_display,   type: String
+field :operation,     type: String
+field :parameters,    type: String
+field :display,       type: String, default: '1'
+field :css,           type: String
+field :js,            type: String
+field :form,          type: String
+field :valid_from,    type: DateTime
+field :valid_to,      type: DateTime
+field :captcha_type,  type: String
+field :active,        type: Boolean, default: true 
+field :created_by,    type: BSON::ObjectId
+field :updated_by,    type: BSON::ObjectId
 
-  index( { name: 1 }, { unique: true } )
+index( { name: 1 }, { unique: true } )
 
-  embeds_many :dc_poll_items
+embeds_many :dc_poll_items
+
+########################################################################
+# Save poll results to DcPollResults collection
+# 
+# Params:
+# data : Hash : Records hash (params[:record])
+########################################################################
+def save_results(data)
+  h = {}
+  items = self.form.blank? ? self.dc_poll_items : YAML.load(self.form.gsub(' ',' '))
+  items.each do |item|
+    next if %w(hidden_field submit_tag link_to comment).include?(item.type)
+    next if item.try(:options).match('hidden')
+    h[ item['name'] ] = data[ item['name'] ]
+  end
+  DcPollResult.create(dc_poll_id: self.id, data: h.to_yaml)
+end    
+    
 end

data/app/models/{drgcms_form_fields/drgcms_form_fields.rb → dc_poll_result.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012+ Damjan Rems
+# Copyright (c) 2020+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,5 +21,26 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-module DrgcmsFormFields
+########################################################################
+# == Schema information
+#
+# Collection name: dc_poll_results : Pools results saved
+#
+#  _id                  BSON::ObjectId       _id
+#  dc_poll_id           BSON::ObjectId       poll id
+#  data                 String               Data saved as YAML
+#  confirmed            Boolean              Poll entry was confirmed
+#
+# Results of polls saved as YAML structure.
+########################################################################
+class DcPollResult
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :dc_poll
+  field :data,        type: String
+  field :confirmed,   type: Boolean, default: false
+
+  index( { dc_poll_id: 1 } )
+
 end

data/app/models/dc_temp.rb

@@ -0,0 +1,140 @@
+#--
+# Copyright (c) 2020+ 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.
+#++
+
+########################################################################
+# == Schema information
+#
+# Collection name: dc_temp : Collection used for temporary saving of any models data
+# 
+# dc_temp collection has only two fields. Key and Data hash. Data must be populated 
+# prior to for display best in dc_new_record callback.
+# 
+########################################################################
+class DcTemp
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+  field :key,     type: String
+  field :data,    type: Hash,     default: {}
+  field :active,  type: Time,     default: Time.now
+  field :order,   type: String
+  
+  index key: 1
+  
+########################################################################
+# Initilize object
+########################################################################
+def initialize(parms = {})
+  super()
+  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']
+  parms.each { |k, value| self.data[k] = value }
+end
+
+########################################################################
+# 
+########################################################################
+def __id()
+  self.data['id']
+end
+
+########################################################################
+# Respond_to should always return true.
+########################################################################
+def respond_to?(a=nil,b=nil)
+  true
+end
+
+########################################################################
+# Redefine send method. Send is used to assign or access value by cmsedit controller.
+########################################################################
+def send(field,value=nil)
+  return super(field) if field.is_a? Symbol
+  field = field.to_s
+  if field.match('=')
+    field.chomp!('=')
+    self.data[field] = value
+  else
+    self.data[field]
+  end
+end
+
+########################################################################
+# Redefine [] method to act similar as send method
+########################################################################
+def [](field)
+  self.data[field.to_s]
+end
+
+########################################################################
+# Redefine [] method to act similar as send method
+########################################################################
+def []=(field, value)
+  self.data[field.to_s] = value
+end
+
+########################################################################
+# For debugging purposes
+########################################################################
+def to_s
+  "DcTemp: @key=#{self.key} @data=#{self.data.inspect}"
+end
+  
+########################################################################
+# Method missing will return value if value defined by m parameter is saved to
+# @internals array or will save field value to @internals hash if m matches '='.
+########################################################################
+def method_missing(m, *args, &block) #:nodoc:
+  m = m.to_s
+  if m.match('=')
+    m.chomp!('=')
+    self.data[m] = args.first
+  else
+    self.data[m]
+  end   
+end
+
+########################################################################
+# Remove all documents with specified key from dc_temp collection
+########################################################################
+def self.clear(key)
+  self.where(key: key).delete
+end
+
+########################################################################
+# Prepare dc_temp for data. It first checks if data associated with the key is to
+# be deleted and then yields block code. 
+# 
+# Returns: Query for the data associated with the key
+########################################################################
+def self.prepare(key:, clear: nil)
+  unless %w(no false 0).include?(clear.to_s.strip.downcase)
+    self.clear(key)
+    yield
+  end
+  self.where(key: key) 
+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.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012+ Damjan Rems
+# Copyright (c) 2020+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,10 +20,18 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-##############################################################
-# Require all files in drgcms_form_fields directory.
-###############################################################
 
-Dir[File.join(__dir__, "drgcms_form_fields/*.rb")].each do |file|
-  require file
+module DrgcmsFormFields
+  
+def self.field(parent, record, options) 
+  klass = options['type'].camelize
+  if DrgcmsFormFields.const_defined?(klass)
+    field = DrgcmsFormFields.const_get(klass).new(parent, record, options).render
+    [field.html + (field.js.size > 0 ? @parent.javascript_tag(field.js) : ''),field.css]
+  else
+    nil
+  end
 end
+
+end
+

data/app/models/drgcms_form_fields/action.rb

@@ -0,0 +1,61 @@
+#--
+# 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.
+#++
+module DrgcmsFormFields
+
+###########################################################################
+# Implementation of action DRG CMS form field. Actions can also be inserted on
+# the form like just like on action pane.
+# 
+# ===Form options:
+# * +type:+ action (required)
+# * +action_type:+ link, submit or ajax action (default link)
+# * +caption:+ Caption for action
+# * +icon:+ Action icon
+# * +url:+ direct url link
+# * +controller:+ controller name
+# * +action:+ action name 
+# * +html:+ html options which apply to link_to (optional)
+#      
+# Form example:
+#    30:
+#      type: link_to
+#      caption: Some action
+#      icon: cogs
+#      controller: my_controller
+#      action: my_action
+#      id: id # will be replaced by record._id
+###########################################################################
+class Action < DrgcmsField
+  
+###########################################################################
+# Render link_to field html code
+###########################################################################
+def render
+  @yaml['type'] = @yaml['action_type'] || 'link'
+  #
+  @html << '<ul class="action">' + @parent.dc_link_ajax_window_submit_action(@yaml,@record) + '</ul>'
+  self
+end
+
+end
+end

data/app/models/drgcms_form_fields/check_box.rb

@@ -30,6 +30,7 @@ module DrgcmsFormFields
 # * +type:+ check_box (required)
 # * +choices:+ Values check_box separated by comma (1,0) (yes,no)
 # * +checked_value:+ 1 or yes or approved
+# * +label:+ displayed right to square field
 # * +unchecked_value:+ 0 or no or not approved
 # * +html:+ html options which apply to check_box field (optional)
 #      
@@ -41,6 +42,7 @@ module DrgcmsFormFields
 #      name: status
 #      type: check_box
 #      choices: yes,no
+#      label: label
 ###########################################################################
 class CheckBox < DrgcmsField
   
@@ -62,6 +64,7 @@ def render
   else
     @parent.check_box(record, @yaml['name'], @yaml['html'])
   end
+  @html << "<label for=\"record_#{@yaml['name']}\">#{@yaml['label']}</label>" if @yaml['label']
   self
 end
 end