drg_cms 0.5.50.2 → 0.5.51.1

data/app/assets/stylesheets/drg_cms_cms.css

@@ -11,6 +11,7 @@
  *= require drg_cms/drg_cms
  *= require drg_cms/jquery.datetimepicker.css
  *= require drg_cms/select-multiple
+ *= require drg_cms/jstree
 
  *= require jquery-ui/all
  

data/app/controllers/cmsedit_controller.rb

@@ -234,7 +234,7 @@ def index
         return render(action: :index)
       end
 # pagination but only if not already set
-      unless (@form['table'] == 'dc_dummy' or @records.options[:limit])
+      unless (@form['table'] == 'dc_memory' or @records.options[:limit])
         per_page = (@form['result_set']['per_page'] || 30).to_i
         @records = @records.page(params[:page]).per(per_page) if per_page > 0
       end
@@ -590,6 +590,11 @@ def read_drg_cms_form
   if @form['extend']
     form = YAML.load_file( dc_find_form_file(@form['extend']) )
     @form = forms_merge(form, @form)
+# If combined form contains tabs and fields options, merge fields into tabs
+    if @form['form']['tabs'] and @form['form']['fields']
+      @form['form']['tabs']['fields'] = @form['form']['fields']
+      @form['form']['fields'] = nil
+    end
   end
 # add readonly key to form if readonly parameter is passed in url
   @form['readonly'] = 1 if params['readonly'] #and %w(1 yes true).include?(params['readonly'].to_s.downcase.strip)
@@ -756,7 +761,7 @@ def process_return_to(return_to)
     when return_to.match(/reload/i) then 'location.href=location.href;'
     else "location.href='#{return_to}'"
   end
-  render text: js_tag(script)
+  render html: js_tag(script).html_safe, layout: false
 end
 
 ########################################################################
@@ -785,11 +790,12 @@ def save_data
   return true if fields.size == 0
 #
   fields.each do |v|
-    next if v['type'].nil?
-    next if v['type'].match('embedded') # don't wipe embedded fields
-    next if params[:edit_only] and params[:edit_only] != v['name'] # otherwise other fields would be wiped
-    next unless @record.respond_to?(v['name']) # there can be temporary fields on the form
-    next if v['readonly'] # fields with readonly option don't retain value and would be wiped
+    session[:form_processing] = v['name'] # for debuging
+    next if v['type'].nil? or
+            v['type'].match('embedded') or # don't wipe embedded types
+            (params[:edit_only] and params[:edit_only] != v['name']) or # otherwise other fields would be wiped
+            v['readonly'] or # fields with readonly option don't return value and would be wiped
+            !@record.respond_to?(v['name']) # there can be temporary fields on the form
 # return value from form field definition
     value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
     @record.send("#{v['name']}=", value)
@@ -802,17 +808,13 @@ 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. This was before callback
-  @record.dc_before_save(self) if @record.respond_to?('dc_before_save')
-#
+# save data  
   changes = @record.changes
   update_standards() if changes.size > 0  # update only if there has been some changes
   if (saved = @record.save)
     save_journal(operation, changes)
 # callback methods
     if (m = callback_method('after_save') ) then call_callback_method(m)  end
-# check if model has dc_after_save method
-    @record.dc_after_save(self) if @record.respond_to?('dc_after_save')
   end
   saved
 end

data/app/controllers/dc_application_controller.rb

@@ -143,8 +143,8 @@ end
 #   return dc_render_404('Site') unless site
 ########################################################################
 def dc_render_404(where_the_error_is=nil)
-  render(file: "#{Rails.root}/public/404", :status => 404, :layout => false, :formats => [:html], 
-         locals: {error_is: where_the_error_is})
+  logger.info("Error 404: path=#{params[:path]} site=#{@site.name if @site} page=#{@page.subject if @page} design=#{@design}")
+  render(file: "#{Rails.root}/public/404", :status => 404, :layout => false, :formats => [:html])
 end
 
 ########################################################################

data/app/controllers/dc_common_controller.rb

@@ -46,7 +46,7 @@ layout false
 ########################################################################
 def autocomplete
 #  return '' unless session[:edit_mode] > 0 # 
-  return render text: t('drgcms.not_authorized') unless dc_user_can(DcPermission::CAN_VIEW)
+  return render plain: t('drgcms.not_authorized') unless dc_user_can(DcPermission::CAN_VIEW)
 # TODO Double check if previous line works as it should.
   table = params['table'].classify.constantize
   id = [params['id']] || '_id'
@@ -144,7 +144,7 @@ def login
 end
 
 ####################################################################
-# Action is called when restore document from journal is requested.
+# Action for restoring document data from journal document.
 ####################################################################
 def restore_from_journal
 # Only administrators can perform this operation  
@@ -152,17 +152,18 @@ def restore_from_journal
     return render inline: { 'msg_info' => (t ('drgcms.not_authorized')) }.to_json, formats: 'js'
   end
 # selected fields to hash  
-  restore = params[:select].inject({}) {|r,v| r[v.first] = 0 if v.last == '1'; r}
+  restore = {} 
+  params[:select].each {|key,value| restore[key] = value if value == '1' }
   result = if restore.size == 0
     { 'msg_error' => (t ('drgcms.dc_journal.zero_selected')) }
   else
-    j = DcJournal.find(params[:id])
+    journal_doc = DcJournal.find(params[:id])
 # update hash with data to be restored    
-    JSON.parse(j.diff).each {|k,v| restore[k] = v.first if restore[k] }
-# determine tables and record ids    
-    tables = j.tables.split(';')
-    ids = (j.ids.blank? ? [] : j.ids.split(';') ) << j.doc_id
-# find record
+    JSON.parse(journal_doc.diff).each {|k,v| restore[k] = v.first if restore[k] }
+# determine tables and document ids    
+    tables = journal_doc.tables.split(';')
+    ids = (journal_doc.ids.blank? ? [] : journal_doc.ids.split(';') ) << journal_doc.doc_id
+# find document
     doc = nil
     tables.each_index do |i|
       doc = if doc.nil?
@@ -171,11 +172,8 @@ def restore_from_journal
         doc.send(tables[i].pluralize).find(ids[i])
       end
     end
-# restore values
-    restore.each do |k,v|
-      doc.send("#{k}=",v)
-    end
-# save record    
+# restore and save values
+    restore.each { |field,value| doc.send("#{field}=",value) }
     doc.save
 # TODO Error checking    
     { 'msg_info' => (t ('drgcms.dc_journal.restored')) }
@@ -189,7 +187,7 @@ end
 ########################################################################
 def copy_clipboard
 # Only administrators can perform this operation  
-  return render(text: t('drgcms.not_authorized') )  unless dc_user_has_role('admin')
+  return render(plain: t('drgcms.not_authorized') )  unless dc_user_has_role('admin')
 #  
   respond_to do |format|
 # just open new window to same url and come back with html request    
@@ -198,7 +196,7 @@ def copy_clipboard
     format.html do
       doc = dc_find_document(params[:table], params[:id], params[:ids])
       text = "<br><br>[#{params[:table]},#{params[:id]},#{params[:ids]}]<br>"
-      render text: text + doc.as_document.to_json
+      render plain: text + doc.as_document.to_json
     end
     
   end  
@@ -211,7 +209,7 @@ end
 ########################################################################
 def paste_clipboard
 # Only administrators can perform this operation  
-  return render(text: t('drgcms.not_authorized') ) unless dc_user_has_role('admin')
+  return render(plain: t('drgcms.not_authorized') ) unless dc_user_has_role('admin')
   
   result = ''
   respond_to do |format|
@@ -322,9 +320,7 @@ def fill_login_data(user, remember_me)
 # check if role is active in this site
     policy_role = default_policy.dc_policy_rules.find_by(dc_policy_role_id: role.dc_policy_role_id)
     next unless policy_role
-    
 # set edit_mode      
-#    session[:edit_mode] = 1 if policy_role.has_cms_menu
     session[:edit_mode] = 1 if policy_role.permission > 1
     session[:user_roles] << role.dc_policy_role_id
   end
@@ -335,7 +331,6 @@ def fill_login_data(user, remember_me)
     guest = DcUserRole.find_by(:system_name => 'guest')
     session[:user_roles] << guest.id if guest
   end
-  
 # Save remember me cookie if not CMS user and remember me is selected
   if session[:edit_mode] == 0 and remember_me
     cookies.signed[:remember_me] = { :value => user.id, :expires => 180.days.from_now}

data/app/controllers/dc_page_control.rb

@@ -40,4 +40,12 @@ def dc_new_record()
   end
 end
 
+######################################################################
+# Caled just after record is saved to DB.
+######################################################################
+def dc_after_save()
+  menu_class = dc_get_site.menu_class.classify.constantize
+  menu_class.update_menu_item_link(@record.menu_id, @record.subject_link)
+end
+
 end 

data/app/controllers/design_element_settings_control.rb

@@ -0,0 +1,135 @@
+#encoding: utf-8
+#--
+# Copyright (c) 2014+ 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.
+#++
+
+######################################################################
+# DrgcmsControls for editing settings in a document.
+# 
+# Parameters to settings call:
+# :location - model_name where settings document is located. Typicaly dc_page or dc_site.
+# :field_name - name of the field where settings are saved
+# :element - element name as defined on design 
+# :id - document id
+######################################################################
+module DesignElementSettingsControl
+
+######################################################################
+# Check if settings control document exists and return document and 
+# settings values as yaml string.
+# 
+# Return:
+#   [document, data] : Mongoid document, yaml as String
+######################################################################
+def get_settings()
+# On save. Set required variables
+  if params[:record]
+    params[:location]   = params[:record][:dc_location]
+    params[:field_name] = params[:record][:dc_field_name]
+    params[:element]    = params[:record][:dc_element]
+    params[:id]         = params[:record][:dc_document_id]    
+  end
+# Check model
+  begin
+    model = params[:location].classify.constantize    
+  rescue 
+    flash[:error] = 'Invalid or undefined model name!'
+    return false    
+  end
+# Check fild name 
+  begin
+    document = model.find(params[:id])
+    params[:field_name] = case
+      when params[:location] == 'dc_page' then 'params'
+      when params[:location] == 'dc_site' then 'options'
+      otherwise params[:field_name]
+    end  
+# field not defined on document   
+    raise unless document.respond_to?(params[:field_name])
+    yaml = document[params[:field_name]]
+    yaml = '' if yaml.blank?
+  rescue 
+    flash[:error] = 'Invalid or undefined field name!'
+    return false    
+  end
+# Check data
+  begin
+    data = YAML.load(yaml) || {}
+  rescue 
+    flash[:error] = 'Invalid configuration data found!'
+    return false    
+  end
+  [document, data] 
+end
+
+######################################################################
+# Called before edit. 
+# 
+# Load fields on form with values from settings document.
+######################################################################
+def dc_new_record()
+  document, data = get_settings
+  return false if document.class == FalseClass and data.nil?
+# fill values with settings values
+  if data['settings'] and data['settings'][ params[:element] ]
+    data['settings'][ params[:element] ].each { |key, value| @record.send("#{key}=", value) }
+  end
+# add some fields required at post as hidden fields to form
+  form = @form['form']['tabs'] ? @form['form']['tabs'].to_a.last : @form['form']['fields']
+  form[9999] = {'type' => 'hidden_field', 'name' => 'dc_location', 'html' => {'value' => params[:location]}}
+  form[9998] = {'type' => 'hidden_field', 'name' => 'dc_field_name'}
+  @record[:dc_field_name] = params[:field_name]
+  form[9997] = {'type' => 'hidden_field', 'name' => 'dc_element'}
+  @record.dc_element = params[:element]
+  form[9996] = {'type' => 'hidden_field', 'name' => 'dc_document_id', 'html' => {'value' => params[:id]}}
+  true
+end
+
+######################################################################
+# Called before save. 
+# 
+# Convert data from fields on form to yaml and save it to document settings field.
+######################################################################
+def dc_before_save()
+  document, data = get_settings
+  return false if document.class == FalseClass and data.nil?
+#
+  fields_on_form.each do |v|
+    session[:form_processing] = v['name'] # for debuging
+    next if v['type'].nil? or
+            v['readonly'] # fields with readonly option don't return value and would be wiped
+# return value from form field definition
+    value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
+    data['settings'] ||= {}
+    data['settings'][ params[:element] ] ||= {}
+    data['settings'][ params[:element] ][ v['name'] ] = value
+  end
+# save data to document field  
+  document.send("#{params[:field_name]}=", data.to_yaml)
+  document.save
+# to re-set form again
+  dc_new_record
+  false # must be 
+end
+
+
+end 

data/app/forms/all_options.yml

@@ -202,4 +202,10 @@ form:
           field: custumer_name
           method: search
         with_new: customer
-        size: 50         
+        size: 50      
+      50:
+        name: kats
+        type: tree_select
+        eval: "DcCategory.choices4_categories(@parent.dc_get_site)"
+        style: 'max-height: 300px'
+        

data/app/forms/cms_menu.yml

@@ -128,5 +128,5 @@ menu:
         caption: drgcms.browse_collections
         controller: cmsedit
         icon: table lg        
-        table: dc_dummy
+        table: dc_memory
         formname: dc_browse_models

data/app/forms/dc_browse_fields.yml

@@ -1,6 +1,6 @@
 ## Registration form. Not yet implemented.
 ---
-table: dc_dummy
+table: dc_memory
 title: Browse field definitions
 controls: browse_models
 permissions:

data/app/forms/dc_browse_models.yml

@@ -1,6 +1,6 @@
 ## Registration form. Not yet implemented.
 ---
-table: dc_dummy
+table: dc_memory
 title: Browse collection models
 controls: browse_models
 permissions:
@@ -11,7 +11,7 @@ result_set:
 
   dblclick:
     type: link
-    table: dc_dummy
+    table: dc_memory
     formname: dc_browse_fields
     action: index
 

data/app/forms/dc_category.yml

@@ -50,15 +50,15 @@ form:
       html:
         size: 5
     50:
-      name: parent
+      name: dc_site_id
       type: select
-      eval: DcCategory.values_for_parent
+      eval: DcSite.choices4_site
       html:
         include_blank: true
     60:
-      name: dc_site_id
+      name: parent
       type: select
-      eval: DcSite.choices4_site
+      eval: DcCategory.values_for_parent
       html:
         include_blank: true
 

data/app/forms/dc_menu.yml

@@ -51,6 +51,12 @@ form:
         type: text_field
         html:
           size: 20
+      50:
+        name: dc_site_id
+        type: select
+        eval: DcSite.choices4_site
+        html:
+          include_blank: true
 
     tab2:
       10:

data/app/forms/dc_page.yml

@@ -87,18 +87,20 @@ form:
         type: datetime_select
         options:
           include_blank: true
+#      120:
+#        name: kats
+#        type: select
+#        multiple: true
+#        eval: "dc_choices4('DcCategory','name','_id',site: :with_nil)"
+#        html:
+#          include_blank: true 
+#          size: 4
       120:
         name: kats
-#        type: multitext_autocomplete
-#        search: dc_category.name     
-#        html:
-#          size: 30
-        type: select
-        multiple: true
-        eval: "dc_choices4('DcCategory','name','_id',site: :with_nil)"
-        html:
-          include_blank: true 
-          size: 4
+        type: tree_select
+        eval: "DcCategory.choices4_categories(@parent.dc_get_site)"
+        style: 'max-height: 300px'
+          
 
     2advanced:
       10:
@@ -107,10 +109,18 @@ form:
         eval: DcDesign.choices4_design(@parent.dc_get_site)
         html:
           include_blank: true
+
       20:
         name: menu_id
-        type: select
-        eval: dc_choices4_menu      
+        type: tree_select
+        eval: '@parent.dc_menu_class.choices4_menu_as_tree(@record.dc_site_id)'        
+        style: 'max-height: 300px'
+        single: true       
+
+#      20:
+#        name: menu_id
+#        type: select
+#        eval: dc_choices4_menu
 
       30:
         name: params