drg_cms 0.5.8 → 0.5.8.2

data/app/forms/dc_key_value_store.yml

@@ -0,0 +1,33 @@
+## YAML Template for dc_key_value_store
+---
+table: dc_key_value_store
+
+index:
+  actions: standard
+
+result_set:
+  actions: 
+    1: edit
+    2: delete
+
+  columns:
+    1:  
+      name: key
+    2: 
+      name: value
+
+form:
+  title: 
+    field: key  
+
+  fields:
+    10:
+      name: key
+      type: text_field
+      size: 30
+
+    20:
+      name: value
+      type: text_field
+      html:
+        size: 50

data/app/helpers/cmsedit_helper.rb

@@ -52,7 +52,7 @@ def dc_actions_for_index()
   <ul class="dc-action-menu">
 EOT
 #
-   actions.each do |k,v|
+  actions.each do |k,v|
     session[:form_processing] = "index:actions: #{k}=#{v}"
     next if v.nil? # must be
     url = @parms.clone
@@ -71,12 +71,14 @@ EOT
       url['table']      = yaml['table']  if yaml['table']
       url['formname']   = yaml['formname'] if yaml['formname']
     end
-# html options of the link   
+# html link options
     yhtml = yaml['html'] || {}
     yhtml['title'] = yaml['title'] if yaml['title']
     html << '<li class="dc-animate">' 
+# 
     html << case 
-    when action == 'sort' then # sort
+# sort
+    when action == 'sort' then 
       choices = [['id','id']]
       if @form['index']['sort']
         @form['index']['sort'].split(',').each do |s| 
@@ -87,20 +89,21 @@ EOT
       fa_icon('sort-alpha-asc') + ' ' + t('drgcms.sort') + ' ' + 
               select('sort', 'sort', choices, { include_blank: true }, 
               { class: 'drgcms_sort', 'data-table' => @form['table']} )
-
-    when action == 'filter' then # filter
+# filter
+    when action == 'filter' then 
       caption = t('drgcms.filter')
+      caption << '&nbsp;' + fa_icon('caret-down lg') + DcFilter.menu_filter(self)
+# add check image, so user will know that filter is active
       s = session[@form['table']]
-# add checked image to filter, so user will know that data is filtered      
-#      caption << '&nbsp;'+image_tag('drg_cms/checkbox-checked.png') if s and s[:filter]
-      yhtml['onclick'] = "$('#drgcms_filter').toggle(300);"
-#      link_to(caption.html_safe, '#', yhtml )
-      dc_link_to('drgcms.filter','filter', '#', yhtml )
-    when action == 'new' then # new
+      caption << ('&nbsp;' << fa_icon('check')) if s and s[:filter]
+      caption
+# new
+    when action == 'new' then 
       caption = yaml['caption'] || 'drgcms.new'
       dc_link_to(caption,'plus', url, yhtml )
-    when action == 'menu' then  # menu
-      caption = t(v['caption'], v['caption'])
+# menu      
+    when action == 'menu' then  
+      caption = t(v['caption'], v['caption']) + '&nbsp;' + fa_icon('caret-down lg')
       caption + eval(v['eval'])      
     else 
       caption = yaml['caption'] || yaml['text']
@@ -109,101 +112,45 @@ EOT
     end
     html << '</li>'
   end
-  html << '</ul></div>'
+  html << '</ul>'
+  html << DcFilter.get_filter_field(self)
+  html << '</div>'
   html.html_safe
 end
 
-############################################################################
-# Will return field form definition if field is defined on form. Subroutine of dc_div_filter
-############################################################################
-def _get_field_def(name) #:nodoc:
-  @form['form']['tabs'].each do |tab|
-    tab.each do |field|
-      next if field.class == String # tab name
-      field.each {|k,v| return v if v['name'] == name }
-    end
-  end if @form['form']['tabs'] #  I know. But nice. 
-#
-  @form['form']['fields'].each do |field|
-    return field.last if field.last['name'] == name
-  end if @form['form']['fields']
-  nil
-end
-
-############################################################################
-# Finds field definition on form and use it for filter input. Subroutine of dc_div_filter.
-############################################################################
-def _get_field_div(name) #:nodoc:
-  filter = nil
-# old filter saved to session  
-  if session[@form['table']] and session[@form['table']][:filter]
-    filter, operation, value = session[@form['table']][:filter].split("\t")
-  end
-# field not defined on form. Must be defined: name as form_field_type  
-  if name.match(' as ')
-    name, dummy, type = name.split(' ')
-    field = {"name" => name, "type" => type, "html"=>{"size"=>20}}
-  else
-    field = _get_field_def(name)
-    field = {"name" => name, "type" => 'text_field', "html"=>{"size"=>20}} if field.nil?
-  end
-#
-  div_hidden = 'div-hidden'
-  if filter
-    div_hidden = '' if name == filter
-    if field['html'] 
-      field['html']['value'] = value
-    else
-      field['html'] = { "value" => value }
-    end
-  end
-  klas_string = field['type'].camelize
-  klas = DrgcmsFormFields::const_get(klas_string) || nil
-  return 'error' if klas.nil?
-#
-  o = klas.new(self, @record, field).render
-  "<span id=\"filter_#{field['name']}\" class=\"#{div_hidden}\">" << o.html << (o.js.size > 2 ? javascript_tag(o.js) : '') << '</span>'
-end
-  
 ############################################################################
 # Creates filter div for cmsedit index/filter action.
 ############################################################################
 def dc_div_filter()
-  choices, inputs = [], ''
+  choices = []
   filter = (@form['index'] and @form['index']['filter']) ? @form['index']['filter'] + ',' : ''
   filter << 'id as text_field' # filter id is added by default
   filter.split(',').each do |f| 
     f.strip!
     name = f.match(' as ') ? f.split(' ').first : f
-    choices << [ t("helpers.label.#{@form['table']}.#{name}", name), name ] 
-# find field definition on form and use it for input field definition
-    inputs << _get_field_div(f)
+    choices << [ t("helpers.label.#{@form['table']}.#{name}", name), f ] 
   end
   choices4_operators = t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )}
-  s = session[@form['table']]
-  is_hidden = (s and s[:filter]) ? '' : ' class="div-hidden" '
-#
+# currently selected options
   if session[@form['table']] and session[@form['table']][:filter]
     field_name, operators_value, dummy = session[@form['table']][:filter].split("\t")
   else
     field_name, operators_value = nil, nil
   end
+  #{ form_tag :table => @form['table'], filter: :on, filter_input: 1, action: :index, method: :post }
+  url = url_for(:table => @form['table'], filter: :on, filter_input: 1, action: :index, controller: :cmsedit)  
   html =<<EOT
-  <div id="drgcms_filter" #{is_hidden}>
+  <div id="drgcms_filter" class="div-hidden">
     <table class="dc-menu"><td>
-  #{ form_tag :table => @form['table'], filter: :on, action: :index, method: :post }
     #{ select(nil, 'filter_field', options_for_select(choices, field_name), { include_blank: true }) }
     #{ select(nil, 'filter_oper', options_for_select(choices4_operators, operators_value)) }
-    #{ inputs }
+
       </td>
-      <td class="dc-link-submit dc-animate">#{fa_icon('check-square-o')} #{submit_tag(t('drgcms.filter_on'), :class => 'dc-submit')}</td>
+      <td class="dc-link dc-animate drgcms_popup_submit" data-url="#{url}">#{fa_icon('check-square-o')} #{t('drgcms.filter_on')}</td>
       <td class="dc-link dc-animate">#{dc_link_to('drgcms.filter_off','close', {action: 'index', filter: 'off', :table => @form['table']}) }</td>
     </table>
-  </form>
 </div>
-  
 EOT
-#      <td class="dc-link dc-animate">#{link_to t('drgcms.filter_off'), action: 'index', filter: 'off', :table => @form['table']}</td>
   html.html_safe
 end
 
@@ -379,8 +326,11 @@ end
 ############################################################################
 # Defines style or class for row (tr) or column (td)
 ############################################################################
-def dc_style_or_class(selector, yaml, value, document)
+def dc_style_or_class(selector, yaml, value, record)
   return '' if yaml.nil?
+# alias record and value so both names can be used  
+  field = value
+  document = record
   html = selector ? "#{selector}=\"" : ''
   html << if yaml.class == String
     yaml
@@ -451,7 +401,7 @@ def dc_columns_for_result(document)
 #
       td = '<td '
       td << dc_style_or_class('class',v['td_class'],value,document)
-      td << dc_style_or_class('style',v['td_style'],value,document)
+      td << dc_style_or_class('style',v['td_style'] || v['style'],value,document)
       html << "#{td}>#{value}</td>"
     end
   end

data/app/models/dc_ad.rb

@@ -22,7 +22,33 @@
 #++
 
 ##########################################################################
-# Mongoid::Document model for dc_ads collection. 
+# == Schema information
+#
+# Collection name: dc_ad : Ads
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  position             String               Position (div id) where this ad will be displayed
+#  description          String               Short description
+#  type                 Integer              Content type of add
+#  file                 String               Picture or flash filename
+#  script               String               JavaScript script, when script type
+#  link                 String               Link to page (site, dokument) when ad is clicked
+#  link_target          String               Define if link is open in new window or same
+#  height               Integer              Height of ad
+#  width                Integer              Width of ad
+#  valid_from           DateTime             Ad is valid from
+#  valid_to             DateTime             Ad is valid to
+#  displays             Integer              Maximum number of time this add is displayed
+#  clicks               Integer              Maximum number of clicks this ad will receive
+#  priority             Integer              Priority. Higher priority means ad is shown more often. Priority is calculated only between candidats to be displayed.
+#  displayed            Integer              No. of times this add has been displayed
+#  clicked              Integer              No. of times this ad has been clicked
+#  active               Mongoid::Boolean     Ad is active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       Record last updated by
+#  dc_site_id           Object               Ad is valid for the site
 # 
 # Ads can be defined as picture file, flash file or script. 
 # 

data/app/models/dc_ad_stat.rb

@@ -22,7 +22,16 @@
 #++
 
 ##########################################################################
-# Mongoid::Document model for dc_ad_stats collection. 
+# == Schema information
+#
+# Collection name: dc_ad_stat : Ads statistics
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  dc_ad_id             BSON::ObjectId       dc_ad_id
+#  ip                   String               ip
+#  type                 Integer              type
 # 
 # Documents in this collection holds data about displays and clicks on ads which
 # can be further processed for statistical purposes.

data/app/models/dc_big_menu.rb

@@ -22,7 +22,24 @@
 #++
 
 ##########################################################################
-# Mongoid::Document model for dc_big_menus collection. 
+# == Schema information
+#
+# Collection name: dc_big_menu : Big menus
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  caption              String               caption
+#  picture              String               picture
+#  parent               BSON::ObjectId       parent
+#  link                 String               link
+#  page_id              BSON::ObjectId       page_id
+#  order                Integer              order
+#  active               Mongoid::Boolean     active
+#  policy_id            BSON::ObjectId       policy_id
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#  dc_site_id           Object               dc_site_id
 #
 # This menu system is still experimental. It can be used for sites with menu
 # which has many sub menus each linked to its own document. Unlike other menu 

data/app/models/dc_big_table.rb

@@ -22,8 +22,21 @@
 #++
 
 ##########################################################################
-# Mongoid::Document model for dc_big_table collection.
-# 
+# == Schema information
+#
+# Collection name: dc_big_table : Big Table
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  key                  String               Key (ident) used to retrieve key/values
+#  description          String               description
+#  site_id              BSON::ObjectId       Data will be used only for defined site. If empty, then it is default for all sites in database.
+#  active               Mongoid::Boolean     This key is active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#  dc_big_table_values  Embedded:DcBigTableValue Values defined by this key
+#   
 # Big table is meant to be a common space for defining default choices for select fields on forms. 
 # Documents are organized as key-value pair with the difference that values for the key can 
 # be defined for every site and can also be localized.

data/app/models/dc_big_table_locale.rb

@@ -22,8 +22,19 @@
 #++
 
 #####################################################################
-# Mongoid::Document model for dc_big_table_locale embedded document.
-# 
+# == Schema information
+#
+# Collection name: dc_big_table_locale : Big Table - locales
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  locale               String               Locale
+#  description          String               Short description translated for target locale
+#  active               Mongoid::Boolean     active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#   
 # Documents are embedded in DcBigTableValue documents. Every value defined in 
 # DcBigTableValue parent document can have its locale translation.
 #####################################################################

data/app/models/dc_big_table_value.rb

@@ -22,8 +22,20 @@
 #++
 
 #####################################################################
-# Mongoid::Document model for dc_big_table_values embedded documents.
-# 
+# == Schema information
+#
+# Collection name: dc_big_table_value : Big Table - values
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  value                String               Value
+#  description          String               Short description of the value
+#  active               Mongoid::Boolean     Active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#  dc_big_table_locales Embedded:DcBigTableLocale Locale translations for the value
+#   
 # Documents are embedded in DcBigTable document. Every value defined has its own description,
 # which can further be translated in embedded DcBigTableLocale documents.
 #####################################################################

data/app/models/dc_category.rb

@@ -22,8 +22,22 @@
 #++
 
 #####################################################################
-# Mongoid::Document model for dc_categories collection.
-# 
+# == Schema information
+#
+# Collection name: dc_category : Categories
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 Last update
+#  name                 String               Category name
+#  description          String               Additional description of category
+#  ctype                Integer              Category type. Could be used for grouping categories.
+#  parent               BSON::ObjectId       Parent category. Leave blank if this is top level category.
+#  active               Mongoid::Boolean     Category is active.
+#  order                Integer              Additional order, which can be used for sorting.
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#   
 # Categories are used on DcPage documents for grouping documents. Categorization 
 # is most useful for grouping news, blog entries ...
 #####################################################################

data/app/models/dc_design.rb

@@ -22,7 +22,23 @@
 #++
 
 ########################################################################
-# Mongoid::Document model for dc_designs collection.
+# == Schema information
+#
+# Collection name: dc_design : Designs
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  description          String               Short description of design
+#  body                 String               Body of design which will be rendered like any Rails view
+#  css                  String               CSS for design
+#  rails_view           String               Rails view (file) name which will be used to render design
+#  author               String               Creater if design
+#  active               Mongoid::Boolean     Is the design active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       Last updated by
+#  site_id              BSON::ObjectId       Select site name if this design belongs to singe site
+#  dc_parts             Embedded:DcPart      Parts of design
 # 
 # Designs are essential parts of DRG CMS. Every DcPage document must have its design document defined.
 # If DcPage documents are anchors for url addresses, DcDesign documents define how 

data/app/models/dc_dummy.rb

@@ -22,7 +22,11 @@
 #++
 
 ########################################################################
-# Mongoid::Document model for dc_dummy collection. 
+# == Schema information
+#
+# Collection name: dc_dummy : Collection name used when form does not belong to database model.
+#
+#  _id                  BSON::ObjectId       _id 
 # 
 # Which is not collection at all. DcDummy model is used for entering data on forms 
 # where data will not be saved to database but will instead be processed by custom 

data/app/models/dc_filter.rb

@@ -0,0 +1,172 @@
+#--
+# 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.
+#++
+
+##########################################################################
+# Model and collection for filtering and sorting data.
+##########################################################################
+class DcFilter
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+  field :dc_user_id,  type: BSON::ObjectId
+  field :table,       type: String
+  field :description, type: String
+  field :filter,      type: String,       default: ''
+  field :public,      type: Boolean
+  field :active,      type: Boolean,      default: true
+  
+  index( { collection: 1, dc_user_id: 1 } )
+  
+  validates :description, presence: true  
+  
+  before_save :do_before_save
+  
+######################################################################
+# Implementation of before_save callback.
+######################################################################
+def do_before_save
+  self.dc_user_id = nil if self.public
+end
+
+######################################################################
+# Will return model with filter query set  
+######################################################################
+def self.get_filter(filter)
+  yaml = YAML.load(filter) rescue nil
+  return yaml if yaml.nil?
+  return nil if yaml['table'].nil? # old data
+#
+  model = yaml['table'].classify.constantize
+  field = yaml['field'] == 'id' ? '_id' : yaml['field'] # must be
+# if value == NIL no filter is necessary
+  return nil if yaml['value'].class == String and yaml['value'] == '#NIL'
+  
+# do regex if operation is like  
+  value = yaml['operation'] == 'like' ? /#{yaml['value']}/i : yaml['value'] 
+# when field type is ObjectId transform value    
+  if model.fields[field] and model.fields[field].type == BSON::ObjectId
+    value = BSON::ObjectId.from_string(value) rescue nil
+  end
+#
+p yaml,'***************'
+  if ['eq','like'].include?(yaml['operation'])
+    model.where(field => value)
+# TODO in operator    
+  else
+    model.where(field.to_sym.send(yaml['operation']) => value)
+  end
+end
+
+############################################################################
+# Will return field form definition if field is defined on form. Field definition
+# will be used for input field on the form.
+############################################################################
+def self.get_field_form_definition(name, parent) #:nodoc:
+  form = parent.form
+  form['form']['tabs'].each do |tab|
+    tab.each do |field|
+      next if field.class == String # tab name
+      field.each {|k,v| return v if v['name'] == name }
+    end
+  end if form['form']['tabs'] #  I know. But nice. 
+#
+  form['form']['fields'].each do |field|
+    return field.last if field.last['name'] == name
+  end if form['form']['fields']
+  nil
+end
+
+############################################################################
+# Return filter input field for entering variable filter values on index form 
+############################################################################
+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?
+#
+  filter = YAML.load(filter) rescue nil 
+  return '' if filter.nil?
+#  return '' if filter['input'].nil?
+#
+  p filter
+  field = get_field_form_definition(filter['field'], parent)
+  return '' if field.nil? and filter['input'].nil?
+  field = {} if field.nil?
+# field redefined with input keyword
+  field['name'] = 'filter_field'
+  field['type'] = filter['input'] if filter['input'].size > 5
+  field['html'] = {} if field['html'].nil?
+  field['html']['size']  = 20
+  field['html']['value'] = filter['value'] unless filter['value'] == '#NIL'
+                      
+  field['html']['data-url'] = parent.url_for(
+    controller: 'cmsedit',action: :index, filter: 'on',
+    table: parent.form['table'], formname: parent.form['formname'])
+  url = field['html']['data-url']
+#
+  field_type  = filter['input'].size > 5 ? filter['input'] : field['type']
+  klas_string = field_type.camelize
+  klas = DrgcmsFormFields::const_get(klas_string) rescue nil
+  return '' if klas.nil?
+#  
+  object = klas.new(parent, nil, field).render
+  js     = object.js
+  "<span class=\"filter_field\" data-url=\"#{url}\">#{object.html} " <<
+    parent.fa_icon('filter lg dc-green', class: 'record_filter_field_icon') <<
+    (js.size > 2 ? parent.javascript_tag(js) : '') << '</span>'
+end
+
+######################################################################
+# Create popup menu for filter options.
+######################################################################
+def self.menu_filter(parent)
+  html = '<ul class="menu-filter">' 
+  table = parent.form['table']
+  documents = self.where(table: table, active: true).to_a
+  documents.each do |document|
+    html << "<li data-filter=\"\">#{document.description}</li>"
+  end
+
+# add filters defined in model
+  model = table.classify.constantize
+  filters = model.dc_filters rescue nil
+  if filters
+# only single defined. Convert to array.    
+    filters = [filters] if filters.class == Hash
+    filters.each do |filter| 
+      url = parent.dc_link_to(filter['title'], nil,controller: :cmsedit, action: :index, table: table,
+                           formname: parent.params[:formname], 
+                           filter_field: filter['field'],
+                           filter_oper: filter['operation'],
+                           filter_value: filter['value'],
+                           filter: 'on')
+      html << "<li>#{url}</li>"
+    end
+  end
+# divide standard and custom filter options  
+  html << '<hr>' if html.size > 30 # 
+#  html << '<li onclick="$(\'#drgcms_filter\').toggle(300);">' + I18n.t('drgcms.filter_set') + '</li>'
+  html << '<li id="open_drgcms_filter">' + I18n.t('drgcms.filter_set') + '</li>'
+  html << '</ul>'
+end
+end