drg_cms 0.6.1.0 → 0.6.1.6

data/app/controllers/dc_common_controller.rb

@@ -45,30 +45,36 @@ layout false
 ########################################################################
 def autocomplete
   # table parameter must be defined. If not, get it from search parameter
-  if params['table'].nil? and params['search'].match(/\./)
+  if params['table'].nil? && params['search'].match(/\./)
     name = params['search'].split('.').first
     params['table'] = name.underscore
   end
-  
-  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'
-# call method in class if search parameter has . This is for user defined searches
-# result must be returned as array of [id, search_field_value]
-  a = if params['search'].match(/\./)
-    name, method = params['search'].split('.')
-    table.send(method, params['input']).inject([]) do |r,v|
-      r << { label: v[0], value: v[0], id: (v[1] || v[0]).to_s }
-    end
-# simply search which will search and return field_name defined in params['search']
+  if params['table'].match('_control')
+    # it must be at least logged on
+    return render json: { label: t('drgcms.not_authorized') } unless dc_user_can(DcPermission::CAN_VIEW, 'dc_memory')
   else
-    table.where(params['search'] => /#{params['input']}/i).limit(20).inject([]) do |r,v|
-      r << { label: v[params['search']], value: v[params['search']], id: v.id.to_s }
-    end
+    return render json: { label: t('drgcms.not_authorized') } unless dc_user_can(DcPermission::CAN_VIEW)
   end
 
-  render plain: a.to_json
+  table = params['table'].classify.constantize
+  input = params['input'].gsub(/\(|\)|\[|\]|\{|\|\.|\,}/, '')
+  # call method in class if search parameter contains . This is for user defined searches
+  a = if params['search'].match(/\./)
+        #method, additional_params = params['search'].split('.')
+        #data = additional_params ? table.send(method, input, additional_params, self) : table.send(method, input)
+        name, method = params['search'].split('.')
+        data = table.send(method, input)
+        data.map do |v|
+          { label: v[0], value: v[0], id: (v[1] || v[0]).to_s }
+        end
+      # will search and return field_name defined in params['search']
+      else
+        table.where(params['search'] => /#{input}/i).limit(20).map do |v|
+          { label: v[params['search']], value: v[params['search']], id: v.id.to_s }
+        end
+      end
+
+  render json: a
 end
 
 ########################################################################
@@ -92,18 +98,19 @@ end
 ##########################################################################
 def toggle_edit_mode
   session[:edit_mode] ||= 0 
-# error when not logged in  
-  return dc_render_404 if session[:edit_mode] < 1 
-# if return_to_ypos parameter is present it will forward it and thus scroll to
-# aproximate position it was when toggle was clicked
+  # error when not logged in
+  return dc_render_404 if session[:edit_mode] < 1
+
+  # if return_to_ypos parameter is present it will forward it and thus scroll to
+  # aproximate position it was when toggle was clicked
   session[:edit_mode] = (session[:edit_mode] == 1) ? 2 : 1
   uri = Rack::Utils.parse_nested_query(request.url)
-# it parses only on & so first (return_to) parameter also contains url
+  # it parses only on & so first (return_to) parameter also contains url
   url = uri.first.last
   if (i = url.index('return_to_ypos')).to_i > 0
-    url = url[0,i-1]
+    url = url[0, i-1]
   end 
-# offset CMS menu
+  # offset CMS menu
   if (ypos = uri['return_to_ypos'].to_i) > 0
     ypos += session[:edit_mode] == 2 ? 250 : -250
   end
@@ -116,8 +123,8 @@ end
 # Default user login action.
 ####################################################################
 def process_login
-# Somebody is probably playing
-  return dc_render_404 unless ( params[:record] and params[:record][:username] and params[:record][:password] )
+  # Somebody is probably playing
+  return dc_render_404 unless ( params[:record] && params[:record][:username] && params[:record][:password] )
 
   unless params[:record][:password].blank? #password must not be empty
     user  = DcUser.find_by(username: params[:record][:username], active: true)
@@ -154,7 +161,7 @@ def login
       clear_login_data # on the safe side
     end
   end
-# Display login 
+  # Display login
   route = params[:route] || 'poll'
   redirect_to "/#{route}?poll_id=login&return_to=#{params[:return_to]}"
 end
@@ -163,23 +170,23 @@ end
 # Action for restoring document data from journal document.
 ####################################################################
 def restore_from_journal
-# Only administrators can perform this operation  
+  # Only administrators can perform this operation
   unless dc_user_has_role('admin')
     return render plain: { 'msg_info' => (t ('drgcms.not_authorized')) }.to_json
   end
-# selected fields to hash  
+  # selected fields to hash
   restore = {} 
-  params[:select].each {|key,value| restore[key] = value if value == '1' }
+  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
     journal_doc = DcJournal.find(params[:id])
-# update hash with data to be restored    
+    # update hash with data to be restored
     JSON.parse(journal_doc.diff).each {|k,v| restore[k] = v.first if restore[k] }
-# determine tables and document ids    
+    # 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
+    # find document
     doc = nil
     tables.each_index do |i|
       doc = if doc.nil?
@@ -188,10 +195,10 @@ def restore_from_journal
         doc.send(tables[i].pluralize).find(ids[i])
       end
     end
-# restore and save values
+    # restore and save values
     restore.each { |field,value| doc.send("#{field}=",value) }
     doc.save
-# TODO Error checking    
+    # TODO Error checking
     { 'msg_info' => (t ('drgcms.dc_journal.restored')) }
   end
   render plain: result.to_json
@@ -202,10 +209,11 @@ end
 # window with data formatted as json.
 ########################################################################
 def copy_clipboard
-# Only administrators can perform this operation  
+  # Only administrators can perform this operation
   return render(plain: t('drgcms.not_authorized') )  unless dc_user_can(DcPermission::CAN_ADMIN,'dc_site')
+
   respond_to do |format|
-# just open new window to same url and come back with html request    
+    # just open new window to same url and come back with html request
     format.json { dc_render_ajax(operation: 'window', url: request.url ) }
     
     format.html do
@@ -213,7 +221,6 @@ def copy_clipboard
       text = "<br><br>[#{params[:table]},#{params[:id]},#{params[:ids]}]<br>"
       render plain: text + doc.as_document.to_json
     end
-    
   end  
 end
 
@@ -223,17 +230,19 @@ end
 # ajax call for processing data.
 ########################################################################
 def paste_clipboard
-# Only administrators can perform this operation  
+  # Only administrators can perform this operation
   return render(plain: t('drgcms.not_authorized') )  unless dc_user_can(DcPermission::CAN_ADMIN,'dc_site')
+
   result = ''
   respond_to do |format|
-# just open new window to same url and come back with html request    
+    # just open new window to same url and come back with html request
     format.html { return render('paste_clipboard', layout: 'cms') }
     format.json {
       table, id, ids = nil
       params[:data].split("\n").each do |line|
         line.chomp!
         next if line.size < 5                 # empty line. Skip
+
         begin
           if line[0] == '['                   # id(s)
             result << "<br>#{line}"
@@ -260,7 +269,7 @@ def add_json_ld_schema
   edited_document = DcJsonLd.find_document_by_ids(params[:table], params[:ids])
   yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
   schema_data = yaml[params[:schema]]
-# Existing document  
+  # Existing document
   if edited_document.dc_json_lds.find_by(type: "@#{params[:schema]}")
     return render json: {'msg_error' => t('helpers.help.dc_json_ld.add_error', schema: params[:schema] ) }
   else
@@ -337,7 +346,7 @@ def update_json(json, is_update=false) #:nodoc:
   json.each do |k,v|
     if v.class == Hash
       result[k] = v['$oid'] unless is_update
-#TODO Double check if unless works as expected
+      # TODO Double check if unless works as expected
     elsif v.class == Array
       result[k] = []
       v.each {|e| result[k] << update_json(e, is_update)}
@@ -354,22 +363,22 @@ end
 def process_document(line, table, id, ids)
   if params[:do_update] == '1' 
     doc = dc_find_document(table, id, ids)
-# document found. Update it and return
+    # document found. Update it and return
     if doc
       doc.update( update_json(ActiveSupport::JSON.decode(line), true) )
       msg = dc_check_model(doc)
       return (msg ? " ERROR! #{msg}" : " UPDATE. OK.")
     end
   end
-# document will be added to collection      
+  # document will be added to collection
   if ids.to_s.size > 5
-#TODO Add embedded document
+    #TODO Add embedded document
     " NOT SUPPORTED YET!"
   else
     doc = table.classify.constantize.new( update_json(ActiveSupport::JSON.decode(line)) )
     doc.save
   end
-  msg = dc_check_model(doc)
+  msg = DrgCms.model_check(doc)
   msg ? " ERROR! #{msg}" : " NEW. OK." 
 end
 

data/app/controls/dc_help_control.rb

@@ -116,6 +116,18 @@ def self.choices_for_form_name(session)
   Dir["#{session[:help_project]}/*.yml"].map { |file_name| File.basename(file_name,'.*') }.sort
 end
 
+######################################################################
+# Will return choices for language select on form. Choices can be either set by dc_locales document in dc_big_table
+# or can be acquired from Rails default locale
+######################################################################
+def self.choices_for_locales
+  choices = DcBigTable.choices4('dc_locales')
+  return choices unless choices[0,0] == I18n.t('drgcms.error')
+
+  choices = [I18n.default_locale] + I18n.fallbacks.inject([]) { |r, e| r << e.first }
+  choices.map(&:to_s).uniq
+end
+
 ######################################################################
 # Will return temp key for data saved in dc_temp file
 ######################################################################

data/app/controls/dc_report.rb

@@ -153,8 +153,9 @@ def export_to_excel(report_id)
       excel[n, i] = value
     end
   end
-  workbook.write Rails.root.join("public/tmp/#{report_id}.xls")
-  dc_render_ajax(operation: :window, value: "/tmp/#{report_id}.xls")
+  file_name = "#{report_id}-#{Time.now.to_i}.xls"
+  workbook.write Rails.root.join('public', 'tmp', file_name)
+  dc_render_ajax(operation: :window, value: "/tmp/#{file_name}")
 end
 
 ############################################################################
@@ -200,15 +201,12 @@ end
 # @param [Object] txt : Text or object. Result of to_s method of the object is
 # @param [Hash] opts
 ###############################################################################
-def pdf_text(txt, opts={})
-  box_opts = {}
+def pdf_text(txt, opts = {})
+  box_opts = opts.dup
   ypos = @pdf.cursor
   xpos = opts.delete(:atx) || 0
-  box_opts.merge!(single_line: (opts.delete(:single_line) || true))
-  box_opts.merge!(at: (opts.delete(:at) || [xpos, ypos]))
-  box_opts.merge!(width: opts[:width]) if opts[:width]
-  box_opts.merge!(align: opts[:align]) if opts[:align]
-  box_opts.merge!(inline_format: opts[:inline_format]) if opts[:inline_format]
+  box_opts[:single_line] ||= true
+  box_opts[:at] ||= [xpos, ypos]
 
   @pdf.text_box(txt.to_s, box_opts)
 end

data/app/controls/design_element_settings_control.rb

@@ -58,7 +58,7 @@ def get_settings()
 # Check fild name 
   begin
     document = model.find(params[:id])
-    params[:field_name] ||= (params[:location] == 'dc_site' ? 'options' : 'params')
+    params[:field_name] ||= (params[:location] == 'dc_site' ? 'settings' : 'params')
 # field not defined on document   
     raise unless document.respond_to?(params[:field_name])
     yaml = document[params[:field_name]] || ''

data/app/forms/all_options.yml

@@ -51,6 +51,14 @@ index:
       eval: ModulClassName.menu_for(self)
       caption: Some caption
 
+# result_set method
+result_set:
+  type: method
+  eval: my_helper_method
+# or
+  view: path_to/_partial
+
+# result_set default
 result_set:
   filter: custom_filter
   footer: custom_footer
@@ -140,7 +148,15 @@ form:
       method: (get),put,post
       caption: ajax_call
       control: control_name.method_to_call
-      when_new: false
+      show: default || always || readonly
+
+      active: not_new_record
+      active: new_record
+      active: SomeClass.is_active_method
+      or
+      active:
+        method: SomeClass.is_active_method
+
     5: 
       type: window
       controller: cmsedit
@@ -149,15 +165,17 @@ form:
       action: edit
       method: (get),put,post
       caption: Edit linked document
-      when_new: false
       params:
         id:
           object: record (can be omitted)
           method: page_id
         user:
           object: session
-          method: user_id          
-      
+          method: user_id
+      html:
+        data-x: 800
+        data-y: 400
+        data-fields: field1,field2,...
     6: 
       type: script
       caption: Cancle 
@@ -165,7 +183,6 @@ form:
     7:
       type: submit
       caption: Send
-      when_new: false
       params:
         before-save: send_mail
         after-save: return_to parent.reload
@@ -251,6 +268,7 @@ form:
         type: embedded
         load: default,delay,always
         form_name: dc_poll_item
+        readonly: no
         html:
           height: 800      
       20:
@@ -264,7 +282,8 @@ form:
       40:
         name: customer_id
         type: text_autocomplete
-        search: 
+        search: model_name.method.additional_parameter
+        search:
           table: customer
           field: custumer_name
           method: search

data/app/forms/dc_big_table.yml

@@ -59,5 +59,3 @@ form:
       name: dc_big_table_values
       type: embedded
       form_name: dc_big_table_value
-      html:
-        height: 600      

data/app/forms/dc_big_table_value.yml

@@ -48,5 +48,3 @@ form:
       name: dc_big_table_locales
       type: embedded
       form_name: dc_big_table_locale
-      html:
-        height: 300      

data/app/forms/dc_design.yml

@@ -79,5 +79,4 @@ form:
         type: embedded
         caption: false
         form_name: dc_part
-        html:
-          height: 1000
+        load: delay

data/app/forms/dc_folder_permission.yml

@@ -46,5 +46,3 @@ form:
       type: embedded
       table: dc_policy_rule
       form_name: dc_policy_rule_nocms
-      html:
-        height: 400

data/app/forms/dc_help_1.yml

@@ -20,8 +20,9 @@ index:
       type: field
       name: lang_1
       caption: drgcms.dc_help.lang
-      field_type: text_field
+      field_type: text_with_select
       size: 5
+      eval: DcHelpControl.choices_for_locales
       default:
         eval: '@parent.session[:help_lang]'
       html:

data/app/forms/dc_json_ld.yml

@@ -54,6 +54,3 @@ form:
       name: dc_json_lds
       type: embedded
       table: dc_json_ld
-      html:
-        height: 400
-      

data/app/forms/dc_menu.yml

@@ -32,25 +32,21 @@ form:
       10:
         name: name
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       20:
         name: description
         type: text_field
-        html:
-          size: 20
+        size: 20
 
       30:
         name: div_name
         type: text_field
-        html:
-          size: 20
+        size: 20
       40:
         name: link_prepend
         type: text_field
-        html:
-          size: 20
+        size: 20
       50:
         name: dc_site_id
         type: select
@@ -64,13 +60,11 @@ form:
         type: embedded
         caption: false
         form_name: dc_menu_item
-        html:
-          height: 1000
+        load: delay
 
     tab3:
       20:
         name: css
         caption: false
         type: text_area
-        html:
-          size: 100x50
+        size: 100x50

data/app/forms/dc_menu_item.yml

@@ -75,7 +75,5 @@ form:
         type: embedded
         caption: false
         form_name: dc_menu_item
-        html:
-          height: 1000
-
+        load: delay
   

data/app/forms/dc_page.yml

@@ -99,6 +99,10 @@ form:
         eval: DcDesign.choices4_design(@parent.dc_get_site)
         html:
           include_blank: true
+      15:
+        name: div_class
+        type: text_field
+        size: 20
 
       20:
         name: menu_id
@@ -153,8 +157,7 @@ form:
         caption: false
         type: embedded
         form_name: dc_part
-        html:
-          height: 600
+        load: delay
           
     5iframe:
       10:

data/app/forms/dc_policy.yml

@@ -40,8 +40,7 @@ form:
     40:
       name: message
       type: text_area
-      html:
-        size: 100x5
+      size: 100x5
 
     50:
       name: active
@@ -51,6 +50,4 @@ form:
       name: dc_policy_rules
       type: embedded
       form_name: dc_policy_rule
-      html:
-        height: 400
-        
+

data/app/forms/dc_poll.yml

@@ -37,14 +37,12 @@ form:
       10:
         name: name
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       20:
         name: title
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       30:
         name: sub_text
@@ -54,8 +52,7 @@ form:
       35:
         name: pre_display
         type: text_field
-        html:
-          size: 50
+        size: 50
       40:
         name: operation
         type: select
@@ -63,8 +60,7 @@ form:
       50:
         name: parameters
         type: text_field
-        html:
-          size: 50
+        size: 50
 
       60:
         name: display
@@ -73,8 +69,7 @@ form:
       70:
         name: captcha_type
         type: text_field
-        html:
-          size: 10
+        size: 10
 
       80:
         name: valid_from
@@ -92,8 +87,7 @@ form:
       100:
         name: css
         type: text_area
-        html:
-          size: 100x20
+        size: 100x20
 
       110:
         name: active
@@ -103,8 +97,8 @@ form:
         name: js
         type: text_area
         caption: false
+        size: 100x50
         html:
-          size: 100x50
           style: 'font-family:courier;'
     tab3:
       20:
@@ -112,13 +106,13 @@ form:
         caption: false
         type: embedded
         form_name: dc_poll_item
-        html:
-          height: 800      
+        load: delay
+
     tab4:
       10:
         name: form
         caption: false
         type: text_area
+        size: 100x50
         html:
-          size: 100x50
           style: 'font-family:courier;'

data/app/forms/dc_seo.yml

@@ -29,5 +29,4 @@ form:
         help: helpers.help.dc_seo.dc_json_lds
         type: embedded
         table: dc_json_ld
-        html:
-          height: 600
+        load: delay

data/app/forms/dc_simple_menu.yml

@@ -63,8 +63,7 @@ form:
         type: embedded
         caption: false
         form_name: dc_simple_menu_item
-        html:
-          height: 800
+        load: delay
 
     tab3:
       20:

data/app/forms/dc_site.yml

@@ -84,12 +84,8 @@ form:
         name: document_extension
         type: text_field
         size: 10
-      25:
-        name: site_layout
-        type: text_field
-        size: 20
       30:
-        name: page_table
+        name: site_layout
         type: text_field
         size: 20
       40:
@@ -132,8 +128,7 @@ form:
         type: text_area
         size: 130x40
 
-    5permissions:        
-
+    5permissions:
       10:
         name: inherit_policy
         type: select
@@ -145,9 +140,12 @@ form:
         type: embedded
         caption: false
         form_name: dc_policy
+        load: delay
+
     6parts:
       10:
         name: dc_parts
         caption: false
         type: embedded
         form_name: dc_part
+        load: delay

data/app/helpers/cms_common_helper.rb

@@ -345,7 +345,7 @@ def dc_help_for_tab(tab)
     label, help = dc_label_help(field.last)
     next if help.blank?
 
-    html << %(<div class="help-field"><div class="help-label">#{label}</div><div class="help-text">#{help}</div></div>)
+    html << %(<div class="help-field"><div class="help-label">#{label}</div><div class="help-text">#{help.gsub("\n",'<br>')}</div></div>)
   end
   html
 end
@@ -356,13 +356,12 @@ end
 def dc_help_fields
   return '' if @form['form'].nil?
 
-  html = '<div class="dc-handle" data-div="#the1"></div><div id="the1">'
+  html = '<a id="fields"></a>'
   if @form['form']['tabs']
     @form['form']['tabs'].each { |tab| html << dc_help_for_tab(tab) }
   else
     html << dc_help_for_tab(@form['form']['fields'])
   end
-  html << '</div>'
   html.html_safe
 end