drg_cms 0.6.1.9 → 0.7.0.2

data/app/helpers/cms_index_helper.rb

@@ -59,7 +59,7 @@ def dc_actions_for_index
     session[:form_processing] = "index:actions: #{key}=#{options}"
     next if options.nil? # must be
 
-    url = @parms.clone
+    url = @form_params.clone
     yaml = options.class == String ? {'type' => options} : options # if single definition simulate type parameter
     action = yaml['type'].to_s.downcase 
     if action == 'url'
@@ -90,8 +90,10 @@ def dc_actions_for_index
         end
       end
       data = t('drgcms.sort') + select('sort', 'sort', choices, { include_blank: true }, { class: 'dc-sort-select',
-                                 'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
-      html_right << %(<li><div class="dc-sort">#{data}</li>)
+                                                                                           'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
+      data = mi_icon('sort') + select('sort', 'sort', choices, { include_blank: true }, { class: 'dc-sort-select',
+                                                                                           'data-table' => @form['table'], 'data-form' => CmsHelper.form_param(params)} )
+      html_right << %(<li title="#{t('drgcms.sort')}"><div class="dc-sort">#{data}</li>)
 
     # filter
     when action == 'filter'
@@ -102,7 +104,7 @@ def dc_actions_for_index
       html_right << %(
 <li>
   <div class="dc-filter" title="#{DcFilter.title4_filter_off(table)}" data-url="#{url.html_safe}">
-    #{mi_icon(url.blank? ? 'search' : 'search_off') }#{DcFilter.menu_filter(self).html_safe}
+    #{mi_icon(url.blank? ? 'search' : 'filter_alt_off') }#{DcFilter.menu_filter(self).html_safe}
   </div>
 </li>#{DcFilter.get_filter_field(self)}).html_safe
 
@@ -132,7 +134,7 @@ def dc_actions_for_index
 # reorder      
     when action == 'reorder' then  
       caption = t('drgcms.reorder')
-      parms = @parms.clone
+      parms = @form_params.clone
       parms['operation'] = v
       parms['id']       = params[:ids]
       parms['table']     = @form['table']
@@ -257,13 +259,13 @@ def dc_actions_column
   actions = { 'standard' => true } if actions.class == String && actions == 'standard'
   std_actions = { 2 => 'edit', 5 => 'delete' }
   if actions['standard']
-    actions.merge!(std_actions) 
+    actions.merge!(std_actions)
     actions.delete('standard')
   end
   # check must be first action
-  has_check = actions.first[1] == 'check'
+  has_check = actions[0] && actions[0]['type'] == 'check'
   width = actions.size == 1 ? 22 : 44
-  width = 22 if actions.size > 2 and !has_check
+  width = 22 if actions.size > 2 && !has_check
   [actions, width, has_check]
 end
 
@@ -290,7 +292,7 @@ def dc_actions_for_result(document)
   main_menu, sub_menu = '', ''
   actions.sort_by(&:first).each do |num, action|
     session[:form_processing] = "result_set:actions: #{num}=#{action}"
-    parms = @parms.clone
+    parms = @form_params.clone
     # if single definition simulate type parameter
     yaml = action.class == String ? { 'type' => action } : action
 
@@ -362,7 +364,7 @@ def dc_header_for_result
   html = '<div class="dc-result-header">'
   if @form['result_set']['actions'] && !@form['readonly']
     ignore, width, has_check = dc_actions_column()
-    check_all = fa_icon('check-square-o', class: 'dc-check-all') if has_check
+    check_all = fa_icon('check-box-o', class: 'dc-check-all') if has_check
     html << %(<div class="dc-result-actions" style="width:#{width}px;">#{check_all}</div>)
   end
   # preparation for sort icon  
@@ -372,22 +374,20 @@ def dc_header_for_result
   end
 
   if (columns = @form['result_set']['columns'])
-    columns.sort.each do |k, v|
-      session[:form_processing] = "result_set:columns: #{k}=#{v}"
-      next if v['width'].to_s.match(/hidden|none/i)
-
-      th = %(<div class="th" style="width:#{v['width'] || '15%'};text-align:#{v['align'] || 'left'};" data-name="#{v['name']}")
-      label = v['caption'] || v['label']
-      label = (v['name'] ? "helpers.label.#{@form['table']}.#{v['name']}" : '') if label.nil?
-      label = t(label) if label.match(/\./)
+    columns.sort.each do |key, options|
+      session[:form_processing] = "result_set:columns: #{key}=#{options}"
+      next if options['width'].to_s.match(/hidden|none/i)
+
+      th = %(<div class="th" style="width:#{options['width'] || '15%'};text-align:#{options['align'] || 'left'};" data-name="#{options['name']}")
+      label = t_label_for_column(options)
       # no sorting when embedded documents or custom filter is active
       sort_ok = !dc_dont?(@form['result_set']['sort'], false)
       sort_ok = sort_ok || (@form['index'] && @form['index']['sort'])
-      sort_ok = sort_ok && !dc_dont?(v['sort'], false)
+      sort_ok = sort_ok && !dc_dont?(options['sort'], false)
       if @tables.size == 1 && sort_ok
         icon = 'sort_unset md-18'
-        filter_class = form_has_input_field?(v['name']) ? nil : 'no-filter'
-        if v['name'] == sort_field
+        filter_class = form_has_input_field?(options['name']) ? nil : 'no-filter'
+        if options['name'] == sort_field
           icon = sort_direction == '1' ? 'sort_down md-18' : 'sort_up md-18'
         else
           # no icon if filter can not be set
@@ -395,7 +395,7 @@ def dc_header_for_result
         end
         # sort and filter icon
         icon = mi_icon(icon, class: filter_class) if icon
-        url = url_for(controller: 'cmsedit', action: 'run', control: 'cmsedit.sort', sort: v['name'],
+        url = url_for(controller: 'cmsedit', action: 'run', control: 'cmsedit.sort', sort: options['name'],
                       t: CmsHelper.table_param(params), f: CmsHelper.form_param(params))
         th << %(><span data-url="#{url}">#{label}</span>#{icon}</div>)
       else
@@ -472,27 +472,29 @@ end
 def dc_columns_for_result(document)
   return '' unless @form['result_set']['columns']
 
-  html = ''  
-  @form['result_set']['columns'].sort.each do |k,v|
+  html, index = '', 0
+  @form['result_set']['columns'].sort.each do |k, v|
     session[:form_processing] = "result_set:columns: #{k}=#{v}"
     next if v['width'].to_s.match(/hidden|none/i)
 
     # convert shortcut to hash 
     v = {'name' => v} if v.class == String    
     begin
-      # eval
-      value = if v['eval']
-        dc_process_column_eval(v, document)
-      # as field        
-      elsif document.respond_to?(v['name'])
-        dc_format_value(document.send( v['name'] ), v['format']) 
-      # as hash (dc_memory)
-      elsif document.class == Hash 
-        dc_format_value(document[ v['name'] ], v['format'])
-      # error
-      else
-        "??? #{v['name']}"
-      end
+              # as Array (footer)
+      value = if document.class == Array
+                dc_format_value(document[index], v['format']) if document[index]
+              # as Hash (dc_memory)
+              elsif document.class == Hash
+                dc_format_value(document[ v['name'] ], v['format'])
+              # eval
+              elsif v['eval']
+                dc_process_column_eval(v, document)
+              # as field
+              elsif document.respond_to?(v['name'])
+                dc_format_value(document.send( v['name'] ), v['format'])
+              else
+                "??? #{v['name']}"
+              end
     rescue Exception => e
       dc_log_exception(e, 'dc_columns_for_result')
       value = '!!!Error'
@@ -507,6 +509,7 @@ def dc_columns_for_result(document)
     style = "style=\"#{width_align}#{style}\" "
 
     html << "<div class=\"td #{clas}\" #{style}>#{value}</div>"
+    index += 1
   end
   html.html_safe
 end

data/app/helpers/dc_application_helper.rb

@@ -242,7 +242,7 @@ end
 # and renderers during page rendering.
 ########################################################################
 def dc_page_bottom
-  %(<style type="text/css">#{@css}</style>#{javascript_tag @js}).html_safe
+  %(<style>#{@css}</style>#{javascript_tag @js}).html_safe
 end
 
 ############################################################################
@@ -258,13 +258,9 @@ end
 ############################################################################
 def dc_table_title(text, result_set = nil)
   c = %(<div class="dc-title">#{text})
-  # help button
-  type = result_set.nil? ? 'form' : 'index'
-  form_name = CmsHelper.form_param(params) || CmsHelper.table_param(params)
-  url = url_for(controller: :dc_common, action: :help, type: type, f: form_name)
-  c << %(<div class="dc-help-icon dc-link-ajax" data-url=#{url}>#{fa_icon('question-circle')}</div>)
+  c << dc_help_button(result_set)
 
-  if result_set and result_set.respond_to?(:current_page)
+  if result_set && result_set.respond_to?(:current_page)
     c << %(<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no', filter: nil})}</div>)
   end
   c << '<div style="clear: both;"></div></div>'
@@ -302,11 +298,11 @@ end
 # Returns:
 # String. HTML code for title.
 ############################################################################
-def dc_new_title()
+def dc_new_title
   session[:form_processing] = "form:title:"
   title = @form['form']['title']
   # defined as form:title:new
-  if title and title['new']
+  if title && title['new']
     t( title['new'], title['new'] )
   else
     # in memory structures
@@ -318,50 +314,22 @@ def dc_new_title()
   end
 end
 
-####################################################################
-# Formats label and html input code for display on edit form.
-#  
-#  Parameters:
-#  [input_html] String. HTML code for data input field.
-#  [label] String. Input field label.
-####################################################################
-def dc_label_for(input_html, label)
-  c =<<eot
-<tr>
-  <td class="dc-edit-label">#{label}</td>
-  <td class="dc-edit-field">#{input_html}</td>
-</tr>
-eot
-  c.html_safe
-end
-
 ############################################################################
 # Similar to rails submit_tag, but also takes care of link icon, translation, ...
 ############################################################################
-def dc_submit_tag(caption, icon, parms, rest={})
-  parms['class'] ||= 'dc-link'
-  if icon
-    icon_image = if icon.match(/\./)
-      image_tag(icon)
-    elsif icon.match('<i')
-      icon
-    else
-      fa_icon(icon)
-    end
-  end
-  html = icon_image || ''
-  #html << submit_tag(t(caption, caption), parms)
-  %Q[<button type="submit" class="dc-submit" name="commit" value="#{t(caption, caption)}">#{icon_image} #{t(caption, caption)}</button>].html_safe
+def dc_submit_tag(caption, icon, parms, rest = {})
+  icon_image = dc_icon_for_link(icon, nil)
+  %(<button type="submit" class="dc-submit" name="commit" value="#{t(caption, caption)}">#{icon_image} #{t(caption, caption)}</button>).html_safe
 end
 
 ############################################################################
 # Returns icon code if icon is specified
 ############################################################################
-def dc_icon_for_link(icon)
+def dc_icon_for_link(icon, clas = 'dc-link-img')
   return '' if icon.blank?
 
   if icon.match(/\./)
-    _origin.image_tag(icon, class: 'dc-link-img')
+    _origin.image_tag(icon, class: clas)
   elsif icon.match('<i')
     icon
   else
@@ -623,7 +591,7 @@ def dc_page_edit_menu(opts = @opts)
   opts[:editparams] ||= {}
   dc_link_menu_tag(title) do |html|
     opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', 'icon' => 'edit-o' )
-    opts[:editparams].merge!( :id => page.id, :t => _origin.site.page_class.underscore, f: opts[:form_name], edit_only: 'body' )
+    opts[:editparams].merge!( :id => page.id, :table => _origin.site.page_class.underscore, form_name: opts[:form_name], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
     opts[:editparams].merge!( edit_only: nil, 'icon' => 'edit-o' )
@@ -745,23 +713,6 @@ def dc_choices4_all_collections
   choices.invert.to_a.sort # hash has to be inverted for values to be returned right
 end
 
-########################################################################
-# Merges two forms when current form extends other form. Subroutine of dc_choices4_cmsmenu.
-# With a little help of https://www.ruby-forum.com/topic/142809 
-########################################################################
-def forms_merge(hash1, hash2) #:nodoc:
-  target = hash1.dup
-  hash2.keys.each do |key|
-    if hash2[key].is_a? Hash and hash1[key].is_a? Hash
-      target[key] = forms_merge(hash1[key], hash2[key])
-      next
-    end
-    target[key] = hash2[key] == '/' ? nil :  hash2[key]
-  end
-  # delete keys with nil value
-  target.delete_if{ |k, v| v.nil? }
-end
-
 ##########################################################################
 # Returns choices for creating collection edit select field on CMS top menu.
 ##########################################################################
@@ -772,7 +723,7 @@ def dc_choices4_cmsmenu
     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
+    menus = CmsHelper.forms_merge(menu['menu'], menus) # ignore top level part
  end
 
   html = '<ul>'
@@ -888,7 +839,7 @@ end
 # 
 # Parameters:
 # [ctrl] Controller object or object which holds methods to access session object. For example @parent
-# variable when called from renderer.
+# when called from renderer.
 # [policy_id] Document or documents policy_id field value required to view data. Method will automatically 
 # check if parameter send has policy_id field defined and use value of that field.
 # 
@@ -903,9 +854,11 @@ end
 # False and message from policy that is blocking view if access is not allowed.
 ############################################################################
 def dc_user_can_view(ctrl, policy_id)
-  policy_id = policy_id.policy_id if policy_id and policy_id.respond_to?(:policy_id)
+  @can_view_cache ||= {}
+  policy_id = policy_id.policy_id if policy_id&.respond_to?(:policy_id)
   # Eventualy object without policy_id will be checked. This is to prevent error
   policy_id = nil unless policy_id.class == BSON::ObjectId
+  return @can_view_cache[policy_id] if @can_view_cache[policy_id]
 
   site = ctrl.site
   policies = if site.inherit_policy.blank? 
@@ -915,7 +868,7 @@ def dc_user_can_view(ctrl, policy_id)
   end
   # permission defined by default policy
   default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
-  return false, 'Default access policy not found for the site!' unless default_policy
+  return cache_add(policy_id, false, 'Default access policy not found for the site!') unless default_policy
 
   permissions = {}
   default_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
@@ -923,28 +876,29 @@ def dc_user_can_view(ctrl, policy_id)
   part_policy = nil
   if policy_id
     part_policy = Mongoid::QueryCache.cache { policies.find(policy_id) }
-    return false, 'Access policy not found for part!' unless part_policy
+    return cache_add(policy_id, 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 no roles defined
   if ctrl.session[:user_roles].nil?
     role = Mongoid::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
-    return false, 'System guest role not defined!' unless role
+    return cache_add(policy_id, false, 'System guest role not defined!') unless role
+
     ctrl.session[:user_roles] = [role.id]
   end
   # Check if user has any role that allows him to view part
-  can_view, msg = false,''
-  ctrl.session[:user_roles].each do |role|
-    next unless permissions[role]          # role not yet defined. Will die in next line.
-    if permissions[role] > 0
-      can_view = true
-      break
-    end
+  can_view = ctrl.session[:user_roles].reduce(false) do |result, role|
+    break true if permissions[role] && permissions[role] > 0
   end
-  msg = if !can_view
-    part_policy ? t(part_policy.message,part_policy.message) : t(default_policy.message,default_policy.message)
+
+  msg = ''
+  unless can_view
+    msg = part_policy ? t(part_policy.message, part_policy.message) : t(default_policy.message, default_policy.message)
+    # message may have variable content
+    msg = _origin.render(inline: msg, layout: nil) if msg.match('<%=')
   end
-  return can_view, msg
+  cache_add(policy_id, can_view, msg)
 end
 
 ####################################################################
@@ -1255,5 +1209,12 @@ def dc_img_alt(file_name, text=nil)
   name[0,name.index('.')].downcase rescue name
 end
 
+private
+
+# will cache dc_user_can_view response
+def cache_add(id, can_view, msg)
+  @can_view_cache[id] = [can_view, msg]
+end
+
 
 end

data/app/helpers/dc_category_helper.rb

@@ -0,0 +1,129 @@
+#--
+# 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.
+#++
+
+
+####################################################################
+# Helper for editing categories as tree view.
+####################################################################
+module DcCategoryHelper
+
+####################################################################
+#
+####################################################################
+def categories_as_tree
+  html = '<div id="catagories-as-tree"><ul><li data-id="nil"><span class="mi-o mi-home"></span>'
+  data = DcCategory.where(parent: nil).order_by(order: 1).to_a
+  html_for_category_tree(html, data)
+  (html << '</li></ul></div>' << js_for_category_tree).html_safe
+end
+
+private
+
+####################################################################
+#
+####################################################################
+def html_for_category_tree(html, data)
+  html << '<ul>'
+  data.each do |category|
+    icon = category.active ? 'check_box' : 'check_box_outline_blank'
+    html << %(<li id="#{category.id}" data-parent="#{category.parent}"><span class="mi-o mi-#{icon} mi-18"></span>#{category.name}\n)
+    children = DcCategory.where(parent: category.id).order_by(order: 1).to_a
+
+    html_for_category_tree(html, children) if children.size > 0
+    html << '</li>'
+  end
+  html << '</ul>'
+end
+
+####################################################################
+#
+####################################################################
+def js_for_category_tree
+  %(<script>
+$(function() {
+  $("#catagories-as-tree").jstree( {
+    core: { themes: { icons: false },
+            multiple: false
+          },
+    plugins: ["types", "contextmenu"],
+    contextmenu: {
+        items: function ($node) {
+            return {
+                edit: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.edit')}</span>",
+                    icon: "mi-o mi-edit",
+                    action: function (obj) {
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let params = "&ids=" + id;
+                        location.href = "/cmsedit/" + id + "/edit?t=dc_category&f=dc_category_as_tree" + params;
+                    }
+                },
+
+                new_child: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.new')}</span>",
+                    icon: "mi-o mi-plus",
+                    action: function (obj) {
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let params = "&ids=" + id + "&p_parent=" + id;
+                        location.href = "/cmsedit/new?t=dc_category&f=dc_category_as_tree" + params
+                    }
+                },
+
+                delete: {
+                    label: "<span class='dc-result-submenu'>#{t('drgcms.delete')}</span>",
+                    icon: "mi-o mi-delete",
+                    action: function (obj) {
+                        if (confirmation_is_cancled("#{t('drgcms.confirm_delete')}") === true) return false;
+
+                        let id = $('#catagories-as-tree').jstree('get_selected', true)[0].id;
+                        let id_return = $('#catagories-as-tree').jstree('get_selected', true)[0].data["parent"];
+
+                        $.ajax({
+                            url: "/cmsedit/" + id + "?t=dc_category",
+                            type: 'DELETE',
+                            success: function(data) {
+                              let error = data.match("#{I18n.t('drgcms.category_has_subs')}");
+                              if (error !== null) {
+                                alert(error[0]);
+                                params = "?t=dc_category&f=dc_category_as_tree&ids=" + id;
+                                location.href = "/cmsedit" + params;
+                                return true;
+                              }
+                            }
+                        });
+
+                        let params = "?t=dc_category&f=dc_category_as_tree&ids=" + id_return;
+                        location.href = "/cmsedit" + params;
+                    }
+                },
+            }
+          },
+       },
+    });
+    $("#catagories-as-tree").jstree(true).select_node("#{params[:ids]}");
+});
+
+</script>)
+end
+
+end

data/app/models/dc_category.rb

@@ -42,32 +42,60 @@
 # is most useful for grouping news, blog entries ...
 #####################################################################
 class DcCategory
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field   :name,        type: String
-  field   :description, type: String
-  field   :ctype,       type: Integer, default: 1 
-  field   :parent,      type: BSON::ObjectId
-  field   :active,      type: Boolean, default: true
-  field   :order,       type: Integer, default: 0
-  field   :created_by,  type: BSON::ObjectId
-  field   :updated_by,  type: BSON::ObjectId
-  field   :dc_site_id,  type: BSON::ObjectId
+field   :name,        type: String
+field   :description, type: String
+field   :ctype,       type: Integer, default: 1
+field   :parent,      type: BSON::ObjectId
+field   :active,      type: Boolean, default: true
+field   :order,       type: Integer, default: 0
+field   :created_by,  type: BSON::ObjectId
+field   :updated_by,  type: BSON::ObjectId
+field   :dc_site_id,  type: BSON::ObjectId
 
-  validates :name, :presence => true
-  
-  index  name: 1
-  index  ctype: 1
-  index  site_id: 1
+index  name: 1
+index  ctype: 1
+index  site_id: 1
+
+validates :name, presence: true
+
+before_destroy :can_destroy?
+
+private
+
+#########################################################################
+# Can't delete if category document has children documents
+#########################################################################
+def can_destroy?
+  if DcCategory.where(parent: id).count > 0
+    errors.add(:base, I18n.t('drgcms.category_has_subs'))
+    throw :abort
+  end
+end
   
 #########################################################################
-# Returns all values vhich can be used as parent select field.
+# Returns all values for use as parent select field.
 #########################################################################
-def self.values_for_parent(site_id=nil) #:nodoc:
+def self.values_for_parent(site_id = nil) #:nodoc:
   qry = where(active: true)
   qry = qry.and(dc_site_id: site_id.id) if site_id
-  qry.sort(name: 1).inject([]) {|r,v| r << [v.name, v._id]} 
+  parents = {} # cache parent names to minimize database usage
+  qry.inject([]) do |r, v|
+    if parents[v.parent].nil?
+       name   = ''
+       parent = v.parent
+       until parent.nil?
+         doc    = find(parent)
+         name   = doc.name + ' / ' + name
+         parent = doc.parent
+       end
+       parents[v.parent] = name
+    end
+    name = v.parent ? parents[v.parent] + v.name : v.name
+    r << [name, v._id]
+  end.sort { |a, b| a.first <=> b.first }
 end
 
 #########################################################################
@@ -80,8 +108,8 @@ def self.choices4_ctype(site_id=nil)
     DcBigTable.choices4('dc_category_type', site_id)
   else
     opts = I18n.t('helpers.label.dc_category.choices4_ctype')
-# not defined    
-    return [] if opts.blank?
+    return [] if opts.blank? # not defined
+
     opts.split(',').inject([]) {|result, e| result << e.split(':')}    
   end
 end
@@ -89,13 +117,11 @@ end
 #########################################################################
 # Returns choices for all categories, prepared for tree_select input field
 #########################################################################
-def self.choices4_categories(site_id=nil)
+def self.choices4_categories(site_id = nil)
   qry = where(active: true)
-# 
   ar = [nil]
   ar << site_id.id if site_id
   qry = qry.in(dc_site_id: ar)
-#
   qry.inject([]) { |result, category| result << [category.name, category.id, category.parent, category.order] }
 end
 

data/app/models/dc_journal.rb

@@ -55,6 +55,6 @@ class DcJournal
   field :time,        type: DateTime
   field :diff,        type: String
   
-  index( { user_id: 1, time: -1 } )  
-  index( { time: 1 } )  
+  index user_id: 1
+  index doc_id: 1
 end