drg_cms 0.5.8 → 0.5.8.2

data/app/assets/stylesheets/drg_cms/the-modal.css

@@ -0,0 +1,33 @@
+.themodal-lock {
+	/* when modal is opened we're removing scrollbars from the main content */
+	overflow: hidden;
+}
+
+.themodal-overlay {
+	/* overlay will stay fixed and will take all the space available */
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	top: 0;
+	right: 0;
+	z-index: 100;
+
+	/* if modal content doesn't fit inside the overlay, display scrollbars */
+	overflow: auto;
+
+	/* allow one-finger iPad scrolling */
+	-webkit-overflow-scrolling: touch;
+
+}
+
+/* fix for iPad glitches */
+.themodal-overlay > * {
+	-webkit-transform: translateZ(0px);
+}
+
+.themodal-overlay {
+	background: rgba(0, 0, 0, 0.5);
+	/* IE6–IE8 */
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = #7F000000, endColorstr = #7F000000);
+	zoom: 1;
+}

data/app/assets/stylesheets/drg_cms_cms.css

@@ -16,6 +16,7 @@
  *= #require ../javascripts/drg_cms/elfinder/css/elfinder.min.css
  *= #require ../javascripts/drg_cms/elfinder/css/theme.css
  *= require font-awesome
+ *= require drg_cms/the-modal.css
 */
 
 /* Required for link buttons to look alike */

data/app/controllers/cmsedit_controller.rb

@@ -107,33 +107,64 @@ end
 # Set aditional filter options when filter is defined by filter method in control object.
 ########################################################################
 def user_filter_options(model) #:nodoc:
-# no filter is active or set off
-  if params[:filter] == 'off' or (params[:filter].nil? and session[:tmp_filter].nil?)
-    session[:tmp_filter] = nil
-    return model
-  end
-# 
-  table, field, oper, value = if params[:filter] == 'on' 
-    [model.to_s, params[:filter_field], params[:filter_oper], params[:record][params[:filter_field]] ]
+  table_name = @tables.first[1]
+  if session[table_name]
+    DcFilter.get_filter(session[table_name][:filter]) || model
   else
-    session[:tmp_filter].split("\t")
+    model
+  end
+end
+
+########################################################################
+# Will set session[table_name][:filter] and save last filter settings to session.
+# subroutine of check_filter_options.
+########################################################################
+def set_session_filter(table_name)
+  if params[:filter] == 'off' # clear all values
+    session[table_name][:filter] = nil
+    return
   end
-# filter set previously on other collection
-  if table != model.to_s
-    session[:tmp_filter] = nil
-    return model 
+
+  filter_value = if params[:filter_value].nil?
+# NIL indicates that no filtering is needed        
+    '#NIL'
+  else     
+    if params[:filter_value].class == String and params[:filter_value][0] == '@'
+# Internal value. Remove leading @ and evaluate expression
+      expression = DcInternals.get(params[:filter_value])
+      eval(expression) rescue nil
+    else
+# No filter when empty      
+      params[:filter_value] == '' ? '#NIL' : params[:filter_value] 
+    end
   end
-#
-  field = '_id' if field == 'id' # must be
-  value = /#{value}/ if oper == 'like' # do regex if operation is like
-# 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
-    flash[:error] = t('drgcms.not_id') if value.nil?
-  end
-# save filter to session  
-  session[:tmp_filter] = [ table, field, oper, value ].join("\t")
-  model.where(field => value)
+# if filter field parameter is omitted then just set filter value
+  session[table_name][:filter] =
+  if params[:filter_field].nil?
+    saved = YAML.load(session[table_name][:filter])
+    saved['value'] = filter_value
+    saved.to_yaml
+  else 
+# As field defined. Split name and alternative input field
+    field = if params[:filter_field].match(' as ')
+      params[:filter_input] = params[:filter_field].split(' as ').last.strip
+      params[:filter_field].split(' as ').first.strip
+    else
+      params[:filter_field]
+    end
+#    
+    {'field'     => field, 
+     'operation' => params[:filter_oper], 
+     'value'     => filter_value,
+     'input'     => params[:filter_input],
+     'table'     => table_name }.to_yaml
+  end
+# must be. Otherwise kaminari includes parameter on paging
+   params[:filter]        = nil 
+   params[:filter_id]     = nil 
+   params[:filter_oper]   = nil  
+   params[:filter_input]  = nil 
+   params[:filter_field]  = nil 
 end
 
 ########################################################################
@@ -141,40 +172,22 @@ end
 ########################################################################
 def check_filter_options() #:nodoc:
   table_name = @tables.first[1]
+  model      = @tables.first[0]
   session[table_name] ||= {}
 # process page
   session[table_name][:page] = params[:page] if params[:page]
 # new filter is applied
   if params[:filter]
-    session[table_name][:filter] =
-    if params[:filter] == 'off' # clear all values
-      nil
-    else
-      [ params[:filter_field], params[:filter_oper], params[:record][params[:filter_field]] ].join("\t")
-    end
+    set_session_filter(table_name)
     session[table_name][:page] = 1
-    params[:filter] = nil # must be. Otherwise kaminari includes parameter on paging and everything goes wrong
   end
-# if data model has field dc_site_id ensure that only documents which belong 
-# to the site are selected.
-  model = @tables.first[0]
+# if data model has field dc_site_id ensure that only documents which belong to the site are selected.
   site_id = dc_get_site._id if dc_get_site
 # dont't filter site if no dc_site_id field or user is ADMIN
   site_id = nil if !model.method_defined?('dc_site_id') or dc_user_can(DcPermission::CAN_ADMIN)
-  if session[table_name][:filter]
-    field, oper, value = session[table_name][:filter].split( "\t")
-    field = '_id' if field == 'id' # must be
-    value = /#{value}/i if oper == 'like' # do regex if operation is like
-# 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
-      flash[:error] = t('drgcms.not_id') if value.nil?
-    end
-    @records =  if site_id
-      model.where(dc_site_id: site_id, field => value)
-    else
-      model.where(field => value)
-    end
+#  
+  if @records = DcFilter.get_filter(session[table_name][:filter])
+    @records = @records.and(dc_site_id: site_id) if site_id
   else
     @records = if site_id
       model.where(dc_site_id: site_id)
@@ -182,6 +195,7 @@ def check_filter_options() #:nodoc:
       model
     end
   end
+  
 # pagination if required
   per_page = (@form['result_set']['per_page'] || 30).to_i
   if per_page > 0
@@ -197,6 +211,11 @@ def index
   if @form['result_set'].nil?
     return process_return_to(params[:return_to] || 'reload') 
   end
+# for now enable only filtering of main tables
+  if @tables.size == 1 
+    check_filter_options()
+    check_sort_options()
+  end  
 # result set is defined by filter method in control object
   if @form['result_set']['filter']
     if respond_to?(@form['result_set']['filter'])
@@ -204,7 +223,7 @@ def index
 # something iz wrong. flash[] should have explanation.
       if @records.class == FalseClass
         @records = []
-        return render(action:  :index)
+        return render(action: :index)
       end
 # pagination
       unless @form['table'] == 'dc_dummy'
@@ -215,13 +234,9 @@ def index
       p "Error: result_set:filter: #{@form['result_set']['filter']} not found in controls!"
     end
   else
-    if @tables.size == 1 # for now enable only filtering of main tables
-      check_filter_options()
-      check_sort_options()
-    else
+    if @tables.size > 1 
       rec = @tables.first[0].find(@ids.first)          # top most document.id
       1.upto(@tables.size - 2) { |i| rec = rec.send(@tables[i][1].pluralize).find(@ids[i]) }  # find embedded childrens by ids
-#      p rec,@tables, @tables.last[1].pluralize
       @records = rec.send(@tables.last[1].pluralize)   # current embedded set
 # sort by order if order field is present in model
       if @tables.last[1].classify.constantize.respond_to?(:order)

data/app/controllers/dc_application_controller.rb

@@ -23,15 +23,19 @@
 #++
 
 ##########################################################################
-# Controller holds methods which are of use for all application controllers.
+# DcApplicationControllerController holds methods which are useful for all 
+# application controllers.
 ##########################################################################
 class DcApplicationController < ActionController::Base
   protect_from_forgery
   
+  before_filter :dc_reload_patches if Rails.env.development?
+  
 ########################################################################
-# Writes anything passed as parameter to logger file.
+# Writes anything passed as parameter to logger file. 
+# Very useful for debuging strange errors.
 # 
-# Very usefull for debuging strange errors.
+# @param [Objects] args any parameter can be passed 
 ########################################################################
 def dc_dump(*args)
   args.each do |arg|
@@ -49,15 +53,13 @@ end
 ####################################################################
 # Checks if user has required role.
 # 
-# [Parameters:]
-# [role] 
-# Role can be passed as DcPolicyRole object or as string. If string
-# is passed, dc_policy_roles files is searched for appropriate role.
+# @param [DcPolicyRole] role can be passed as DcPolicyRole object or 
+# @param [String] role as role name. If passed as name, dc_policy_roles  
+# is searched for appropriate role.
 # 
-# [Return:]
-# Boolean. True if user has required role added to his profile.
+# @return [Boolean] True if user has required role added to his profile.
 # 
-# [Example:]
+# @example If user has required role
 #    if dc_user_has_role('admin') ...
 #    if dc_user_has_role('Site editors') ...
 ####################################################################
@@ -73,12 +75,14 @@ def dc_user_has_role(role)
 end
 
 ####################################################################
-# Determine site from url and return site document. 
+# Determines site from url and returns site document. 
 # 
-# [Return:]
-# Site document. If site is not found and not in production environment 'test' 
-# site document is returned. If site has alias set then alias site document is
+# @return [DcSite] site document. If site is not found and not in production environment,
+# 'test' document is returned. If site has alias set then alias site document is
 # returned.
+# 
+# @example Returns Google analytics code from site settings
+#    settings = dc_get_site.params['ga_acc']
 ####################################################################
 def dc_get_site()
   return @site if @site 
@@ -101,9 +105,9 @@ end
 ####################################################################
 # Determine and return site record from url. It would be nice but it is not working.
 ####################################################################
-def self.dc_get_site_() #:nodoc:
-  #self.dc_get_site()
-end
+#def self.dc_get_site_() #:nodoc:
+#  self.dc_get_site()
+#end
 
 ########################################################################
 # Searches forms path for file_name and returns full file name or nil if not found.

data/app/forms/all_options.yml

@@ -44,9 +44,9 @@ result_set:
   actions_width: 100
   per_page: 10
   table_style: 'color: green;'
-  table_class: 'color: green;'
+  table_class: tclass
   tr_style: 'color: green;'
-  tr_class: 'color: green;'
+  tr_class: trclass
   
   actions: standard
 
@@ -75,6 +75,7 @@ result_set:
   columns:
     1:  
       name: name
+      eval: dc_name4_id,dc_site,name
       style: 'align: left; width: 100px'
     2:  
       name: title

data/app/forms/cms_menu.yml

@@ -23,7 +23,7 @@
 
 menu:
   10_system_menu:
-    caption: drgcms.system_menu
+    caption: drgcms.cms_main
     icon: support lg
     
     items:
@@ -42,11 +42,6 @@ menu:
         controller: cmsedit
         icon: file-text-o lg
         table: dc_page
-      40: 
-        caption: helpers.label.dc_user.tabletitle
-        controller: cmsedit
-        icon: users lg        
-        table: dc_user
       50: 
         caption: helpers.label.dc_piece.tabletitle
         controller: cmsedit
@@ -83,37 +78,55 @@ menu:
         controller: cmsedit
         icon: money lg        
         table: dc_ad
-      120: 
-        caption: helpers.label.dc_big_table.tabletitle
+
+  11_system_menu:
+    caption: drgcms.cms_advanced
+    icon: star lg
+    items:
+      10: 
+        caption: helpers.label.dc_user.tabletitle
         controller: cmsedit
-        icon: table lg        
-        table: dc_big_table
-      130: 
+        icon: users lg        
+        table: dc_user
+      20: 
         caption: helpers.label.dc_policy_role.tabletitle
         controller: cmsedit
         icon: user-secret lg        
         table: dc_policy_role
-      140: 
+      30: 
         caption: helpers.label.dc_permission.tabletitle
         controller: cmsedit
         icon: shield lg        
         table: dc_permission
-      150: 
+      40: 
         caption: helpers.label.dc_folder_permission.tabletitle
         controller: cmsedit
         icon: shield lg        
         table: dc_folder_permission
-      160: 
+      60: 
+        caption: helpers.label.dc_big_table.tabletitle
+        controller: cmsedit
+        icon: table lg        
+        table: dc_big_table
+      70: 
+        caption: helpers.label.dc_key_value_store.tabletitle
+        controller: cmsedit
+        icon: list lg        
+        table: dc_key_value_store
+      80: 
+        caption: helpers.label.dc_filter.tabletitle
+        controller: cmsedit
+        icon: filter lg        
+        table: dc_filter
+      500: 
         caption: helpers.label.dc_journal.tabletitle
         controller: cmsedit
         icon: undo lg        
         table: dc_journal
 
-      500: 
+      600: 
         caption: drgcms.browse_collections
         controller: cmsedit
         icon: table lg        
         table: dc_dummy
         formname: dc_browse_models
-
-                

data/app/forms/dc_big_table_value.yml

@@ -22,6 +22,9 @@ result_set:
       name: value
     2:  
       name: description
+    3:  
+      name: active
+      eval: dc_icon4_boolean
 
 form:
   title: 

data/app/forms/dc_filter.yml

@@ -0,0 +1,56 @@
+## DRG Form for dc_filter
+---
+table: dc_filter
+
+index:
+  filter: description,table,dc_user_id
+  actions: standard
+
+result_set:
+  actions: standard
+
+  columns:
+    10:  
+      name: dc_user_id
+      eval: dc_name4_id,dc_user,name
+    20: 
+      name: table
+    30: 
+      name: description
+    40: 
+      name: public
+      eval: dc_icon4_boolean      
+
+form: 
+  actions: standard
+
+  fields:
+
+    10:
+      name: description
+      type: text_field
+      html:
+        size: 50
+   
+    20:
+      name: table
+      type: text_with_select
+      eval: dc_choices4_all_collections      
+      html:
+        size: 30
+
+    30:
+      name: dc_user_id
+      type: select
+      eval: dc_choices4('dc_user','name','_id')
+      html:
+        include_blank: true        
+    40:
+      name: public
+      type: check_box
+
+    50:
+      name: filter
+      type: text_area
+      html:
+        size: 80x20