drg_cms 0.6.0.8 → 0.6.1.0

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']

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/embedded.rb

@@ -49,20 +49,17 @@ class Embedded < DrgcmsField
 ###########################################################################
 # Render embedded field html code
 ###########################################################################
-def render 
-  #return self if @record.new_record?  # would be in error otherwise
+def render
   # HTML defaults. Some must be set    
   @yaml['html'] ||= {}
-  @yaml['html']['height'] ||= 300
-  @yaml['html']['width']  ||= '99%'
+  @yaml['html']['width'] ||= '99%'
+  html = @yaml['html'].inject('') { |r, val| r << "#{val.first}=\"#{val.last}\" " }
+
   @yaml['action'] ||= 'index'
   # defaults both way 
   @yaml['table']     ||= @yaml['form_name'] if @yaml['form_name']
   @yaml['form_name'] ||= @yaml['table'] if @yaml['table']
-  # 
-  html = ''  
-  @yaml['html'].each {|k,v| html << "#{k}=\"#{v}\" "}
-  # 
+
   if @yaml['name'] == @yaml['table'] or @yaml['table'] == 'dc_memory'
     tables = @yaml['table']
     ids    = @record.id

data/app/models/drgcms_form_fields/file_field.rb

@@ -43,7 +43,7 @@ class FileField < DrgcmsField
 ###########################################################################
 def render
   return self if @readonly 
-  #record = record_text_for(@yaml['name'])
+
   @html << @parent.file_field(nil,@yaml['name'], @yaml['html']) 
   self
 end

data/app/models/drgcms_form_fields/file_select.rb

@@ -50,10 +50,10 @@ class FileSelect < DrgcmsField
 ###########################################################################
 def render
   return ro_standard if @readonly  
-# retrieve html editor from page settings
+  # retrieve file_select component from site settings
   selector_string = @parent.dc_get_site.params['file_select'] if @parent.dc_get_site 
   selector_string ||= 'elfinder' 
-# 
+
   klas_string = selector_string.camelize
   if DrgcmsFormFields.const_defined?(klas_string)
     klas = DrgcmsFormFields::const_get(klas_string)

data/app/models/drgcms_form_fields/hash_field.rb

@@ -45,6 +45,7 @@ class HashField < DrgcmsField
 ###########################################################################
 def ro_standard()
   return self if @record[@yaml['name']].nil?
+
   html = ''
   @record[@yaml['name']].each do |key, value|
     html << "#{key}:#{value}<br>"
@@ -57,10 +58,10 @@ end
 ###########################################################################
 def render
   return ro_standard if @readonly
+
   set_initial_value
-#
   record = record_text_for(@yaml['name'])
-# Convert Hash to values separated by colon  
+  # Convert Hash to values separated by colon
   if @record[@yaml['name']]
     @yaml['html']['value'] = @record[@yaml['name']].to_a.inject('') {|r, e| r << "#{e.first}:#{e.last}\n"}
   end
@@ -73,12 +74,15 @@ end
 ###########################################################################
 def self.get_data(params, name)
   return nil if params['record'][name].blank?
-#
-  result = params['record'][name].split("\n").select {|e| !e.blank? }
-  return nil if result.size == 0
-# convert to Hash
+
+  result = params['record'][name].split("\n").select { |e| !e.blank? }
+  return if result.size == 0
+  # convert to Hash
   ret = {}
-  result.map { |e| key,value = e.chomp.split(':'); ret[key.strip] = value.strip unless value.blank? }
+  result.map do |e|
+    key, value = e.chomp.split(':')
+    ret[key.strip] = value.strip if value.present?
+  end
   ret
 end
 

data/app/models/drgcms_form_fields/link_to.rb

@@ -53,13 +53,13 @@ def render
   @yaml['html'] ||= {}
   @yaml['html']['class'] ||= 'dc-link dc-animate'
   @yaml['html'].symbolize_keys!
-#
+
   @yaml[:id] = record._id if @yaml[:id] == 'id'
   url = @yaml['url'] || "#{@yaml[:controller]}/#{@yaml[:action]}/#{@yaml[:id]}"
   url.gsub!('//','/')                             # no action and id
   url = '/' + @yaml['url'] unless url[0,1] == '/' # no leading /
   url.chop if url[0,-1] == '/'                    # remove trailing /
-#
+
   caption = @yaml['caption'] || @yaml['text']
   @html << @parent.dc_link_to(caption, @yaml['icon'], url, @yaml['html'])
   self

data/app/models/drgcms_form_fields/method.rb

@@ -24,9 +24,10 @@ module DrgcmsFormFields
 
 ###########################################################################
 # Implementation of custom DRG CMS form field. Method field will call method or class method
-# defined in eval option and add returned code to HTML output code. This might prove usefull in 
-# cases where form contains complex dta stgructer or set of pictures which can not
-# be simply displayed by any other field.
+# defined in eval option and add returned code to HTML output code.
+#
+# It can be used in case when form contains complex data structure. For example set of pictures which can not
+# be simply displayed by any other DRG Forms field.
 #   
 # Form example:
 #    50:
@@ -44,7 +45,7 @@ class Method < DrgcmsField
 ###########################################################################
 def render
   # might be defined as my_method or MyClass.my_method
-  clas, method = @yaml['eval'].split('.')
+  clas, method = @yaml['eval'].split(/\.|\,/).map(&:strip)
   if method.nil?
     if @parent.respond_to?(clas)
       @html << @parent.send(clas, @record, @yaml, @readonly) 

data/app/models/drgcms_form_fields/multitext_autocomplete.rb

@@ -77,7 +77,7 @@ def render
     method   = @yaml['search']['method']
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   elsif @yaml['search'].to_s.match(/\./)
-    table, field_name, method = @yaml['search'].split(/\.|\,/) 
+    table, field_name, method = @yaml['search'].split(/\.|\,/).map(&:strip)
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   else # search and table name are separated
     search = field_name = @yaml['search']

data/app/models/drgcms_form_fields/select.rb

@@ -133,7 +133,8 @@ def get_choices
       choices.chomp.split(',').inject([]) { |r,v| r << (v.match(':') ? v.split(':') : v ) } :
       choices
   rescue Exception => e 
-    Rails.logger.debug "Error in select eval. #{e.message}\n"
+    Rails.logger.debug "\nError in select eval. #{e.message}\n"
+    Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
     ['error'] # return empty array when error occures
   end
 end
@@ -143,6 +144,7 @@ end
 ###########################################################################
 def add_view_code
   return '' if (data = @record.send(@yaml['name'])).blank?
+
   ar = @yaml['view'].split(/\ |\,/).delete_if {|e| e.blank?}
   table, form_name = *ar
   url  = @parent.url_for(controller: :cmsedit, id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
@@ -186,16 +188,16 @@ end
 ###########################################################################
 def render
   return ro_standard if @readonly
+
   set_initial_value('html','selected')
   # separate options and html part
-  @yaml['html'].symbolize_keys!
   html_part = {}
-  html_part[:class] = @yaml['html'].delete(:class)  if @yaml['html'][:class]
-  html_part[:id]    = @yaml['html'].delete(:id)     if @yaml['html'][:id]
-  html_part[:style] = @yaml['html'].delete(:style)  if @yaml['html'][:style]
+  @yaml['html'].symbolize_keys!
+  %i(class id style required).each { |sym| html_part[sym] = @yaml['html'].delete(sym) if html_part[sym]}
+  html_part[:multiple] = true if @yaml['multiple']
+
   record = record_text_for(@yaml['name'])
-  if @yaml['multiple']
-    html_part[:multiple] = true
+  if html_part[:multiple]
     @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
     @js   << "$('##{record}_#{@yaml['name']}').selectMultiple();"
   else
@@ -212,12 +214,11 @@ end
 def self.get_data(params, name)
   if params['record'][name].class == Array
     params['record'][name].delete_if {|e| e.blank? }
-    return nil if params['record'][name].size == 0
+    return if params['record'][name].size == 0
 
     # convert to BSON objects
     is_id = BSON::ObjectId.legal?(params['record'][name].first)
     return params['record'][name].map{ |e| BSON::ObjectId.from_string(e) } if is_id
-    return params['record'][name]
   end
   params['record'][name]
 end

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -59,7 +59,7 @@ def render
     ret_name = @yaml['search']['field']
     method   = @yaml['search']['method']
   elsif @yaml['search'].match(/\./)
-    table, ret_name, method = @yaml['search'].split('.') 
+    table, ret_name, method = @yaml['search'].split(/\.|\,/).map(&:strip)
   else
     ret_name = @yaml['search']
   end
@@ -74,7 +74,7 @@ def render
       nil
     end
   end
-  return 'Table or field keyword not defined!' unless (table and ret_name)
+  return ro_standard 'Table or field keyword not defined!' unless (table && ret_name)
   # TODO check if table exists
   t = table.classify.constantize
   # find record and return value of field

data/app/views/cmsedit/edit.html.erb

@@ -4,3 +4,5 @@
 <%= form_tag( @parms, method: :put, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
   <%= render partial: 'form' %>
 <% end %>
+
+<div id="popup" style="display: none;"></div>

data/app/views/cmsedit/index.html.erb

@@ -1,5 +1,5 @@
 <div class="dc-form-frame">
-  <%= dc_table_title_for_result @records %>
+  <%= dc_title_for_index @records %>
 
   <%= dc_actions_for_index %>
   <%= dc_div_filter %>
@@ -9,3 +9,4 @@
 
 <%= javascript_tag(@js) unless @js.blank? %>
 <% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>
+<div id="popup" style="display: none;"></div>

data/app/views/cmsedit/new.html.erb

@@ -3,3 +3,5 @@
 <%= form_tag( @parms, method: :post, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
   <%= render partial: 'form' %>
 <% end %>
+
+<div id="popup" style="display: none;"></div>

data/app/views/dc_common/_help.html.erb

@@ -0,0 +1,8 @@
+<%= javascript_include_tag "cms" %>
+
+<div class="dc-help">
+  <h1><%= t('drgcms.dc_help.help') %>: <%= dc_form_title %></h1>
+
+  <div class="help-fields"><%= dc_help_fields if params[:type] == 'form' %></div>
+  <div class="help-body"><%= dc_help_body if @help %></div>
+</div>

data/app/views/layouts/models.html.erb

@@ -3,8 +3,9 @@
 <head>
   <title>Models dump</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
   <%= stylesheet_link_tag "cms", media: 'all' %>
-   <%= javascript_include_tag "cms" %>
+  <%= javascript_include_tag "cms" %>
 </head>
 <body>
 

data/config/locales/drgcms_en.yml

@@ -118,3 +118,15 @@ en:
     filters:
       this_site_only: Documents for currently selected site only
 
+    dc_help:
+      help: HELP
+      title: Manage help documents
+      project: Project
+      lang: Locale
+      project_refresh: Refresh
+      project_refresh_title: Refresh list of available documents
+      form_name: Form
+      updated_at: Updated
+      1basic: Basic
+      2index: Index
+      3form: Form