drg_cms 0.5.6 → 0.5.7

data/app/controllers/cmsedit_controller.rb

@@ -425,9 +425,9 @@ def update
     if save_data
       params[:return_to] = 'index' if params[:commit] == t('drgcms.save&back') # save & back
       @parms['action'] = 'update'
-    end
 # Process return_to link
-    return process_return_to(params[:return_to]) if params[:return_to] 
+      return process_return_to(params[:return_to]) if params[:return_to]      
+    end
   else
     flash[:error] = t('drgcms.not_authorized')
   end
@@ -756,7 +756,7 @@ def save_data
 # dont's save if callback method returns false    
     return false if ret.class == FalseClass
   end
-# maybe model has dc_before_save method defined. Call it.
+# maybe model has dc_before_save method defined. Call it. This was before callback
   @record.dc_before_save(self) if @record.respond_to?('dc_before_save')
 #
   changes = @record.changes

data/app/controllers/dc_application_controller.rb

@@ -229,13 +229,38 @@ def dc_set_options(parameters)
     parameters.split("\n").each do |line|
       line.chomp.split(',').each do |parm|
         key, value = parm.split(':')
-        parms[key.strip] = value.to_s.strip.gsub(/\'|\"/,'')
+        value = value.to_s.strip.gsub(/\'|\"/,'')
+        parms[key.strip] = (value == '/' ? nil : value)
       end
     end
   end
   @options.merge!(parms)
 end
 
+##########################################################################
+# Check if document(s) has been modified since last visit. 
+# [Parameters:]
+# [Documents]: List of documents which are checked against last visit date. If
+# document
+##########################################################################
+def dc_not_modified?(*documents)
+#  request.env.each {|k,v| p k,'*',v}
+  return false unless request.env.include? 'HTTP_IF_MODIFIED_SINCE'
+
+  since_date = Time.parse request.env['HTTP_IF_MODIFIED_SINCE']
+  last_modified = since_date
+  documents.each do |doc|
+    next unless doc.respond_to?(:updated_at)
+    last_modified = doc.updated_at if doc.updated_at > last_modified
+  end
+#  p last_modified, since_date
+  if last_modified >= since_date then
+    render :nothing => true, :status => 304
+    return true
+  end
+  false
+end
+
 ##########################################################################
 # This is default page process action. It will search for site, page and
 # design documents, collect parameters from different objects, add CMS edit code if allowed
@@ -301,20 +326,58 @@ def dc_process_default_request()
     dc_log_visit()
   end
   @page_title = @page.title.blank? ? "#{@site.page_title}-#{@page.subject}" : @page.title
-  layout      = @site.site_layout.to_s.size > 2 ? @site.site_layout : 'content'
+  layout      = @site.site_layout.blank? ? 'content' : @site.site_layout 
+  design      = @design ? @design.body : @site.design
 # render view. inline if defined in design
-  view_filename = ''
-  view_filename = @design.rails_view.to_s if @design
-  view_filename = @site.rails_view.to_s   if view_filename.size < 5
+  view_filename = @design ? @design.rails_view.to_s : ''
+  view_filename = @site.rails_view.to_s if view_filename.blank?
   if view_filename.size < 5
-    @design.body = "<%= render partial: 'cmsedit/edit_stuff' %>\n" + @design.body if session[:edit_mode] > 0 
-    @design.body << '<style type="text/css"><%= @css.html_safe %></style><%= javascript_tag @js %>'
-    render(inline: @design.body, layout: layout)
+    design = "<%= render partial: 'cmsedit/edit_stuff' %>\n" + design if session[:edit_mode] > 0 
+    design << '<style type="text/css"><%= @css.html_safe %></style><%= javascript_tag @js %>'
+    render(inline: design, layout: layout)
   else
     render view_filename, layout: layout
   end
 end
 
+##########################################################################
+# Single site document kind of request handler.
+# 
+# This request handler assumes that all data for the site is saved in the site document. 
+# 
+# Page data is saved in dc_parts documents embedded into site document.
+# Menus are created from description fields. 
+# Menu links are created from link fields.
+# 
+# This kind of page may be good candidate for caching.
+# # Just a reminder: request.session_options[:skip] = true
+##########################################################################
+def dc_single_sitedoc_request
+  session[:edit_mode] ||= 0
+  @site = dc_get_site
+# @site is not defined. render 404 error
+  return dc_render_404('Site!') unless @site
+  dc_set_options(@site.settings)
+# HOMEPAGE. When no parameters is set
+  params[:path] = @site.homepage_link if params[:path].nil?  
+  @parts = @site.dc_parts
+  @part  = @parts.find_by(link: params[:path])
+  return dc_render_404('Part!') unless @part
+# Document was not modified since last visit  
+#  return if dc_not_modified?(@site, @part)
+#  
+  @page_title = "#{@site.page_title} #{@part.name}"
+  @js, @css = '', ''
+  layout = @site.site_layout.blank? ? 'content' : @site.site_layout
+  if @site.rails_view.blank?
+    design = @site.design + '<style type="text/css"><%= @css.html_safe %></style><%= javascript_tag @js %>'
+    design = "<%= render partial: 'cmsedit/edit_stuff' %>\n" + design if session[:edit_mode] > 0 
+    render(inline: design, layout: layout)
+  else
+    render @site.rails_view, layout: layout
+  end
+end
+
 ########################################################################
 # Decamelizes string. Does oposite from camelize method. It probably doesn't work 
 # very good with non ascii chars. Since this method is used for converting from model
@@ -410,41 +473,6 @@ def dc_call_rake(task, options = {})
   system "rake #{task} #{args.join(' ')} --trace 2>&1 >> #{Rails.root}/log/rake.log &"
 end
 
-######################################################################
-# Small helper for rendering ajax return code from controller. When ajax call is
-# made from DRG CMS form return may be quite complicated. All ajax return combinations 
-# can be found in drg_cms.js file. 
-# 
-# [Parameters:]
-# [Hash opts] Different options
-# 
-# [Return:]
-# String. Formatted to be used on ajax return.
-# 
-# [Example:]
-#    html_code = '<span>Some text</span>'
-#    dc_render_ajax(div: 'mydiv', prepand: html_code) # Will prepand code to mydiv div
-#    dc_render_ajax(class: 'myclass', append: html_code) # Will append code to all objects with myclass class
-#    dc_render_ajax(operation: 'window', value: "/pdf_file.pdf") # will open pdf file in new window.
-# 
-######################################################################
-def dc_render_ajax(opts)
-  result = {}
-  if opts[:operation].to_s == 'div' or opts[:operation].to_s == 'class'
-    selector = opts[:operation].to_s == 'div' ? '#' : '.' # for div . for class
-    key = case
-      when opts[:prepend] then "#{selector}+div"
-      when opts[:append]  then "#{selector}div+"
-    else "#{selector}div"
-    end
-    key << '_' + opts[ opts[:operation].to_sym ] 
-  else
-    key = opts[:operation] + '_'
-  end
-  result[key] = opts[:value] || opts[:url] || ''
-  render inline: result.to_json, formats: 'js'
-end
-
 ######################################################################
 # Small helper for rendering ajax return code from controller. When ajax call is
 # made from DRG CMS form return may be quite complicated. All ajax return combinations 

data/app/forms/cms_menu.yml

@@ -22,104 +22,91 @@
 #++
 
 menu:
-  50_system_menu:
+  10_system_menu:
     caption: drgcms.system_menu
+    icon: support lg
+    
     items:
       10: 
         caption: helpers.label.dc_site.tabletitle
         controller: cmsedit
-        picture: dc_site.png
-        params:
-          table: dc_site
+        icon: globe lg
+        table: dc_site
       20: 
         caption: helpers.label.dc_design.tabletitle
         controller: cmsedit
-        picture: dc_design.png
-        params:
-          table: dc_design
+        icon: credit-card lg
+        table: dc_design
       30: 
         caption: helpers.label.dc_page.tabletitle
         controller: cmsedit
-        picture: dc_page.png
-        params:
-          table: dc_page
+        icon: file-text-o lg
+        table: dc_page
       40: 
-        caption: helpers.label.dc_category.tabletitle
+        caption: helpers.label.dc_user.tabletitle
         controller: cmsedit
-        picture: dc_category.png
-        params:
-          table: dc_category
+        icon: users lg        
+        table: dc_user
       50: 
-        caption: helpers.label.dc_user.tabletitle
+        caption: helpers.label.dc_piece.tabletitle
         controller: cmsedit
-        picture: dc_user.png
-        params:
-          table: dc_user
+        icon: puzzle-piece lg        
+        table: dc_piece
       60: 
-        caption: helpers.label.dc_piece.tabletitle
+        caption: helpers.label.dc_link.tabletitle
         controller: cmsedit
-        picture: dc_piece.png
-        params:
-          table: dc_piece
+        icon: link lg        
+        table: dc_link
       70: 
-        caption: helpers.label.dc_link.tabletitle
+        caption: helpers.label.dc_menu.tabletitle
         controller: cmsedit
-        picture: dc_link.png
-        params:
-          table: dc_link
+        icon: th-list lg        
+        table: dc_menu
       80: 
-        caption: helpers.label.dc_menu.tabletitle
+        caption: helpers.label.dc_simple_menu.tabletitle
         controller: cmsedit
-        picture: dc_menu.png
-        params:
-          table: dc_menu
+        icon: ellipsis-h lg        
+        table: dc_simple_menu
       90: 
-        caption: helpers.label.dc_simple_menu.tabletitle
+        caption: helpers.label.dc_category.tabletitle
         controller: cmsedit
-        picture: dc_simple_menu.png
-        params:
-          table: dc_simple_menu
+        icon: list lg        
+        table: dc_category
+          
       100: 
         caption: helpers.label.dc_poll.tabletitle
         controller: cmsedit
-        picture: dc_poll.png
-        params:
-          table: dc_poll
+        icon: list-alt lg        
+        table: dc_poll
       110: 
         caption: helpers.label.dc_ad.tabletitle
         controller: cmsedit
-        picture: dc_ad.png
-        params:
-          table: dc_ad
+        icon: money lg        
+        table: dc_ad
       120: 
         caption: helpers.label.dc_big_table.tabletitle
         controller: cmsedit
-        picture: dc_big_table.png
-        params:
-          table: dc_big_table
+        icon: table lg        
+        table: dc_big_table
       130: 
         caption: helpers.label.dc_policy_role.tabletitle
         controller: cmsedit
-        picture: dc_policy_role.png
-        params:
-          table: dc_policy_role
+        icon: user-secret lg        
+        table: dc_policy_role
       140: 
         caption: helpers.label.dc_permission.tabletitle
         controller: cmsedit
-        picture: dc_permission.png
-        params:
-          table: dc_permission
+        icon: shield lg        
+        table: dc_permission
       150: 
         caption: helpers.label.dc_folder_permission.tabletitle
         controller: cmsedit
-        picture: dc_permission.png
-        params:
-          table: dc_folder_permission
+        icon: shield lg        
+        table: dc_folder_permission
       160: 
         caption: helpers.label.dc_journal.tabletitle
         controller: cmsedit
-        picture: dc_journal.png
-        params:
-          table: dc_journal
+        icon: undo lg        
+        table: dc_journal
 
                 

data/app/forms/dc_page.yml

@@ -3,7 +3,7 @@
 table: dc_page
 
 index:
-  filter: subject, sub_subject as text_field, subject_link, author_name, body as text_field
+  filter: subject, sub_subject as text_field, subject_link, author_name, dc_site_id, body as text_field
   actions: standard
 
 result_set:

data/app/forms/dc_site.yml

@@ -156,4 +156,12 @@ form:
         formname: dc_policy
         html:
           height: 800
+    6parts:
+      10:
+        name: dc_parts
+        type: embedded
+        formname: dc_part
+        html:
+          height: 1000
+          
 

data/app/helpers/cmsedit_helper.rb

@@ -400,7 +400,11 @@ def dc_columns_for_result(document)
       value = if v['eval']
         if v['eval'].match('dc_name4_id')
           a = v['eval'].split(',')
-          dc_name4_id(a[1], a[2], document[ v['name'] ])
+          if a.size == 3
+            dc_name4_id(a[1], a[2], nil, document[ v['name'] ])
+          else
+            dc_name4_id(a[1], a[2], a[3], document[ v['name'] ])
+          end
         elsif v['eval'].match('dc_name4_value')
           dc_name4_value( @form['table'], v['name'], document[ v['name'] ] )
         elsif v['eval'].match('eval ')
@@ -563,13 +567,15 @@ def dc_actions_for_form()
           v['caption'] ||= v['text'] 
           caption = t("#{v['caption'].downcase}", v['caption'])
           url     = url_for(parms)
+          p url
           request = v['request'] || v['method'] || 'get'
           icon    = v['icon'] ? "#{fa_icon(v['icon'])} " : ''
           if v['type'] == 'ajax' # ajax button
             %Q[<td class="dc-link-ajax dc-animate" id="dc-submit-ajax" data-url="#{url}" 
                data-request="#{request}" title="#{v['title']}">#{icon}#{caption}</td>]
           else                   # link button
-            %Q[<td class="dc-link dc-animate" title="#{v['title']}><a href="#{url}">#{icon}#{caption}</a></td>]
+#            %Q[<td class="dc-link dc-animate" title="#{v['title']}><a href="#{url}">#{icon}#{caption}</a></td>]
+            %Q[<td class="dc-link dc-animate">#{dc_link_to(v['caption'],v['icon'], parms)}</td>]
           end
         end
 # Javascript action        

data/app/helpers/dc_application_helper.rb

@@ -43,6 +43,8 @@ attr_reader :ids
 attr_reader :form
 # options object
 attr_reader :options
+# part
+attr_reader :part
 
 # page title
 attr_accessor :page_title
@@ -577,25 +579,32 @@ end
 # Parameters:
 # [model] String. Table (collection) model name (lowercase).
 # [field] String. Field name holding the value of descriptive text.
-# [id] BSON Key. Key value.
+# [field_name] String. ID field name. This is by default id, but can be any other 
+# (preferred unique) field.
+# [value] Value of id_field. Usually a BSON Key but can be any other data type.
 # 
 # Example:
 #    # usage in program.
-#    dc_name4_id('dc_user', 'name', dc_page.created_by)
+#    dc_name4_id('dc_user', 'name', nil, dc_page.created_by)
 #
 #    # usage in form
 #    columns:
 #      2: 
 #        name: site_id
 #        eval: dc_name4_id,site,name
+#    # username is saved to document instead of user.id field
+#      5: 
+#        name: user
+#        eval: dc_name4_id,dc_user,name,username
 # 
 # Returns: 
 # String. Name (descriptive value) for specified key in table.
 ############################################################################
-def dc_name4_id(model, field, id)
+def dc_name4_id(model, field, field_name, id=nil)
   return '' if id.nil?
+  field_name = 'id' if field_name.nil?
   model = model.classify.constantize if model.class == String
-  rec = Mongoid::QueryCache.cache { model.find_by(id: id) }
+  rec = Mongoid::QueryCache.cache { model.find_by(field_name.to_sym => id) }
   rec.nil? ? '' : rec[field]
 end
 
@@ -712,7 +721,7 @@ def dc_choices4_all_collections
       next unless section.last['items']             # next if no items
       section.last['items'].each do |k, v|          # look for caption and 
         key = v['params']['table']
-        choices[key] ||= "#{t(v['caption'], v['caption'])} - #{key}" 
+        choices[key] ||= "#{key} - #{t(v['caption'], v['caption'])}" 
       end
     end
   end  
@@ -753,7 +762,7 @@ def dc_choices4_cmsmenu()
   menus.to_a.sort.each do |one_menu|    # sort menus, result is array of sorted hashes
     menu = one_menu[1]                  # value is the second (1) element of array
     next unless menu['caption']
-    choices << ["--- #{ t(menu['caption'], menu['caption']) }",'#']
+    choices << ["--- #{ t(menu['caption'], menu['caption']) } ---",'#']
     menu['items'].to_a.sort.each do |item|          # as above. sort items first 
       key, value = item[0], item[1]
       opts = { controller: value['controller'], action: value['action'] }
@@ -764,6 +773,39 @@ def dc_choices4_cmsmenu()
   choices
 end
 
+##########################################################################
+# Returns choices for creating collection edit select field on CMS top menu.
+##########################################################################
+def dc_choices4_cmsmenu()
+  menus = {}
+  DrgCms.paths(:forms).reverse.each do |path|
+    filename = "#{path}/cms_menu.yml"
+    next unless File.exist?(filename)
+    menu = YAML.load_file(filename) rescue nil      # load menu
+    next if menu.nil? or !menu['menu']              # not menu or error
+    menus = forms_merge(menu['menu'], menus)        # ignore top level part
+ end
+#
+  html = ''
+  menus.to_a.sort.each do |one_menu|    # sort menus, result is array of sorted hashes
+    menu = one_menu[1]                  # value is the second (1) element of array
+    next unless menu['caption']
+    html << "<li>#{fa_icon(menu['icon'])}#{t(menu['caption'])}<ul>"
+    menu['items'].to_a.sort.each do |item|          # as above. sort items first 
+      value = item[1]
+      opts = { controller: value['controller'], 
+               action: value['action'], 
+               table: value['table'],
+               formname: value['formname'] || value['table'],
+               target: value['target'] || 'iframe_cms'               
+             }
+      html << "<li>#{dc_link_to(t(value['caption']), value['icon'] || '', opts)}</li>"      
+    end   
+    html << '</ul></li>'  
+  end
+  html
+end
+
 ############################################################################
 # Returns list of directories as array of choices for use in select field 
 # on folder permission form. Directory root is determined from dc_site.files_directory field.
@@ -778,7 +820,7 @@ def dc_choices4_folders_list
 end
 
 ############################################################################
-# Returns choices for select input field when choices can be generated from
+# Returns choices for select input field when choices are generated from
 # all documents in collection.
 # 
 # Parameters:  
@@ -795,8 +837,12 @@ end
 #      eval: dc_choices4('dc_poll','name','_id')
 ############################################################################
 def dc_choices4(model, name, id='_id', options = {})
-  qry = model.classify.constantize.only(id, name).sort(name => 1)
-  qry = qry.where(dc_site_id: dc_get_site()) if options[:site_only]
+  model = model.classify.constantize
+  qry   = model.only(id, name)
+  qry   = qry.and(dc_site_id: dc_get_site()) if options[:site_only]
+  qry   = qry.and(active: true) if model.method_defined?(:active)
+  qry   = qry.sort(name: 1) 
+#  
   choices = []
   qry.each {|v| choices << [ v[name], v[id] ] }
   choices
@@ -866,7 +912,7 @@ def dc_user_can_view(ctrl, policy_id)
   site = ctrl.site
   policies = site.dc_policies
 # permission defined by default policy
-  default_policy = policies.find_by(is_default: true)
+  default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
   return false, 'Default accsess policy not found for the site!' unless default_policy
 #  
   permissions = {}
@@ -874,13 +920,13 @@ def dc_user_can_view(ctrl, policy_id)
 # update permissions with defined policy 
   part_policy = nil
   if policy_id
-    part_policy = policies.find(policy_id)
+    part_policy = Mongoid::QueryCache.cache { policies.find(policy_id) }
     return false, 'Access policy not found for part!' unless part_policy
     part_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
   end
 # apply guest role if user has no roles defined
   if ctrl.session[:user_roles].nil?
-    role = DcPolicyRole.find_by(system_name: 'guest', active: true)
+    role = Mongoid::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
     return false, 'System guest role not defined!' unless role
     ctrl.session[:user_roles] = [role.id]
   end