drg_cms 0.6.0.8 → 0.6.1.5

data/app/controllers/dc_common_controller.rb

@@ -1,6 +1,5 @@
-#coding: utf-8
 #--
-# Copyright (c) 2012-2013 Damjan Rems
+# 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
@@ -46,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
 
 ########################################################################
@@ -93,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
@@ -117,14 +123,16 @@ 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)
     if user and user.authenticate(params[:record][:password])
       fill_login_data(user, params[:record][:remember_me].to_i == 1)
       return redirect_to params[:return_to] ||  '/'
+    else
+      clear_login_data # on the safe side
     end
   end
   flash[:error] = t('drgcms.invalid_username')
@@ -149,12 +157,11 @@ def login
     if user and user.active
       fill_login_data(user, true)
       return redirect_to params[:return_to]
-
     else
       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
@@ -269,8 +278,37 @@ def add_json_ld_schema
   render json: {'reload_' => 1}
 end
 
+########################################################################
+# Will provide help data
+########################################################################
+def help
+  form_name = params[:form_name] || params[:table]
+  @form = form_name ? YAML.load_file(dc_find_form_file(form_name)) : {}
+  return render json: {} if @form.nil?
+
+  help_file_name = @form['help'] || @form['extend'] || params[:form_name] || params[:table]
+  help_file_name = find_help_file(help_file_name)
+  @help = YAML.load_file(help_file_name) if help_file_name
+  # no auto generated help on index action
+  return render json: {} if params[:type] == 'index' && @help.nil?
+
+  render json: { popup: render_to_string(partial: 'help') }
+end
+
 protected
 
+########################################################################
+# Will search for help file and return it's path if found
+########################################################################
+def find_help_file(help_file_name)
+  file_name = nil
+  DrgCms.paths(:forms).reverse.each do |path|
+    f = "#{path}/help/#{help_file_name}.#{I18n.locale}"
+    file_name = f and break if File.exist?(f)
+  end
+  file_name
+end
+
 ########################################################################
 # Subroutine of add_json_ld_schema for adding one element
 ########################################################################
@@ -308,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)}
@@ -325,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

@@ -0,0 +1,138 @@
+#--
+# Copyright (c) 2021+ 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.
+#++
+
+######################################################################
+# Controls for creating help files
+######################################################################
+module DcHelpControl
+
+######################################################################
+# Will fill dc_temp with help documents found in a defined project directory.
+######################################################################
+def project_refresh
+  DcTemp.clear(temp_key)
+  if params[:record][:select_project].present?
+    # far less complicated if saved to session
+    session[:help_project] = params[:record][:select_project]
+    session[:help_lang] = params[:record][:lang_1]
+    help_dir_name = "#{session[:help_project]}/help/"
+    # create help directory if not yet exists
+    FileUtils.mkdir(help_dir_name) unless File.exist?(help_dir_name)
+    Dir["#{help_dir_name}*"].each do |file_name|
+      lang = File.extname(file_name).sub('.','')
+      next unless lang == session[:help_lang]
+
+      DcTemp.new(key: temp_key,
+                 project: session[:help_project],
+                 form_name: File.basename(file_name,'.*'),
+                 lang: lang,
+                 updated_at: File.mtime(file_name)).save
+    end
+  end
+  render json: { url: url_for(controller: :cmsedit, table: :dc_temp, form_name: :dc_help_1) }
+end
+
+######################################################################
+# Will populate fields with default values
+######################################################################
+def dc_new_record
+  @record.project = session[:help_project]
+  @record.lang = session[:help_lang]
+end
+
+######################################################################
+# Will read data from help file
+######################################################################
+def dc_before_edit
+  file_name = "#{session[:help_project]}/help/#{@record.form_name}.#{session[:help_lang]}"
+  data = YAML.load_file(file_name)
+  @record.index = data['index']
+  @record.form = data['form']
+  flash[:warning] = "Use only in development!" unless Rails.env.development?
+end
+
+######################################################################
+# Will save data to help file
+######################################################################
+def dc_before_save
+  rec = params[:record]
+  file_name = "#{session[:help_project]}/help/#{@record.form_name}.#{@record.lang}"
+  data = { 'index' => @record.index, 'form' => @record.form }
+  File.write(file_name, data.to_yaml)
+end
+
+######################################################################
+# Will return query to report data
+######################################################################
+def data_filter
+  DcTemp.where(key: temp_key).order_by(order: 1)
+end
+
+private
+
+######################################################################
+# Will return choices for select project input field on a form
+######################################################################
+def self.choices_for_project
+  r = DrgCms.paths(:forms).map do |path|
+    path = path.to_s
+    a = path.split('/')
+    project = a[a.size - 3]
+    project = if project == 'app'
+                a[a.size - 4] + ' : ' + a.last(2).join('/')
+              else
+                project + ' : ' + a.last
+              end
+    [project, path]
+  end
+  [[I18n.t('drgcms.dc_help.project'), nil]] + r.sort
+end
+
+######################################################################
+# Will return choices for selecting help file name, based on forms already
+# present in forms directory.
+######################################################################
+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
+######################################################################
+def temp_key
+  "dc-help-#{session[:user_id]}"
+end
+
+end 

data/app/controls/dc_report.rb

@@ -36,14 +36,12 @@ def dc_new_record
 end
 
 ######################################################################
-# Check if report option is present in form and shuffle form, so it can
-# be used to display result.
+# If exists, set report section as form, so it can be used to display result.
 ######################################################################
 def dc_update_form
-  return unless @form && @form['report'] && params[:table] = 'dc_temp'
+  return unless @form && @form['report'] && params[:table] == 'dc_temp'
 
-  # copy form data under report option to top
-  @form['report'].each { |key, data| @form[key] = data }
+  @form = @form['report']
 end
 
 ######################################################################
@@ -118,7 +116,7 @@ end
 # Will write bulk data to dc_temp collection.
 ######################################################################
 def bulk_write(doc, the_end = false)
-  if doc.class == TrueClass
+  if doc.nil? || doc.class == TrueClass
     the_end = true
   else
     @bulk << doc
@@ -134,7 +132,7 @@ end
 # Export data to Excel
 ######################################################################
 def export_to_excel(report_id)
-  read_drg_cms_form if @form.blank?
+  read_drg_form if @form.blank?
   # use report options if present
   columns = (@form['report'] ? @form['report'] : @form)['result_set']['columns'].sort
 
@@ -155,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
 
 ############################################################################
@@ -202,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/forms/all_options.yml

@@ -17,9 +17,7 @@ javascript code
 
 index:
   filter: name, id as text_field
-  select_fields: id,name
-  deny_fields: body,email
-  
+
   actions: standard
   
   actions:
@@ -58,6 +56,8 @@ result_set:
   footer: custom_footer
   actions_width: 100
   per_page: 10
+  select_fields: id,name
+  deny_fields: body,email
 
   dblclick:
     table: model_name
@@ -141,6 +141,7 @@ form:
       caption: ajax_call
       control: control_name.method_to_call
       when_new: false
+      show: default always readonly
     5: 
       type: window
       controller: cmsedit
@@ -196,7 +197,13 @@ form:
         eval: ModelName.choices4_site
         eval: dc_big_table 'key-name'
         html:
-          include_blank: true        
+          include_blank: true
+      90:
+        name: kats
+        type: multitext_autocomplete
+        search: dc_category.name
+        with_new: model_name
+        size: 30
 
       40:
         name: operation
@@ -245,6 +252,7 @@ form:
         type: embedded
         load: default,delay,always
         form_name: dc_poll_item
+        readonly: no
         html:
           height: 800      
       20:
@@ -258,7 +266,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/cms_menu.yml

@@ -127,10 +127,16 @@ menu:
         controller: cmsedit
         icon: trash-o lg
         table: dc_removed_url
+      400:
+        caption: drgcms.dc_help.title
+        controller: cmsedit
+        icon: question-circle lg
+        table: dc_temp
+        form_name: dc_help_1
       500: 
         caption: helpers.label.dc_journal.tabletitle
         controller: cmsedit
-        icon: undo lg
+        icon: history lg
         table: dc_journal
 
       600: 

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_category.yml

@@ -9,7 +9,8 @@ index:
 result_set:
   actions: 
     1: edit
-    2: delete
+    2: duplicate
+    5: delete
 
   columns:
     1:  

data/app/forms/dc_design.yml

@@ -77,6 +77,6 @@ form:
       10:
         name: dc_parts
         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