drg_cms 0.5.52.16 → 0.6.1.0

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
@@ -45,7 +44,12 @@ layout false
 # JSON array [label, value, id] of first 20 documents that confirm to query.
 ########################################################################
 def autocomplete
-#  return '' unless session[:edit_mode] > 0 # 
+  # table parameter must be defined. If not, get it from search parameter
+  if params['table'].nil? and 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
@@ -55,7 +59,7 @@ def autocomplete
   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].to_s }
+      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']
   else
@@ -64,7 +68,7 @@ def autocomplete
     end
   end
 
-  render inline: a.to_json, formats: 'js'
+  render plain: a.to_json
 end
 
 ########################################################################
@@ -88,13 +92,24 @@ end
 ##########################################################################
 def toggle_edit_mode
   session[:edit_mode] ||= 0 
-# called without logged in  
-  if session[:edit_mode] < 1 
-    dc_render_404 
-  else
-    session[:edit_mode] = (session[:edit_mode] == 1) ? 2 : 1
-    redirect_to params[:return_to]
+# 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
+  url = uri.first.last
+  if (i = url.index('return_to_ypos')).to_i > 0
+    url = url[0,i-1]
+  end 
+# offset CMS menu
+  if (ypos = uri['return_to_ypos'].to_i) > 0
+    ypos += session[:edit_mode] == 2 ? 250 : -250
   end
+  url << (url.match(/\?/) ? '&' : '?')
+  url << "return_to_ypos=#{ypos}"
+  redirect_to url
 end
 
 ####################################################################
@@ -109,6 +124,8 @@ def process_login
     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')
@@ -133,7 +150,6 @@ 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
@@ -149,7 +165,7 @@ end
 def restore_from_journal
 # Only administrators can perform this operation  
   unless dc_user_has_role('admin')
-    return render inline: { 'msg_info' => (t ('drgcms.not_authorized')) }.to_json, formats: 'js'
+    return render plain: { 'msg_info' => (t ('drgcms.not_authorized')) }.to_json
   end
 # selected fields to hash  
   restore = {} 
@@ -178,7 +194,7 @@ def restore_from_journal
 # TODO Error checking    
     { 'msg_info' => (t ('drgcms.dc_journal.restored')) }
   end
-  render inline: result.to_json, formats: 'js'  
+  render plain: result.to_json
 end
 
 ########################################################################
@@ -236,8 +252,83 @@ def paste_clipboard
   dc_render_ajax(div: 'result', value: result )
 end
 
+########################################################################
+# Will add new json_ld element with blank structure into dc_json_ld field on a 
+# document.
+########################################################################
+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  
+  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
+    add_empty_json_ld_schema(edited_document, schema_data, params[:schema], params[:schema], yaml)
+  end
+  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
+########################################################################
+def add_empty_json_ld_schema(edited_document, schema, schema_name, schema_type, yaml) #:nodoc
+  data = {}
+  doc = DcJsonLd.new
+  doc.name = schema_name
+  doc.type = schema_type
+ 
+  edited_document.dc_json_lds << doc
+  schema.each do |element_name, element|
+    next if element_name == 'level' # skip level element
+    if yaml[element['type']]
+      if element['n'].to_s == '1'
+        # single element
+        doc_1 = yaml[element['type'] ]
+        data[element_name] = doc_1
+      else
+        # array
+        add_empty_json_ld_schema(doc, yaml[element['type']], element_name, element['type'], yaml)
+      end
+    else
+      data[element_name] = element['text']
+    end
+  end
+  doc.data = data.to_yaml
+  doc.save
+end
+
 ########################################################################
 # Update some anomalies in json data on paste_clipboard action.
 ########################################################################

data/app/controls/dc_help_control.rb

@@ -0,0 +1,126 @@
+#--
+# 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 temp key for data saved in dc_temp file
+######################################################################
+def temp_key
+  "dc-help-#{session[:user_id]}"
+end
+
+end 

data/app/{controllers → controls}/dc_page_control.rb

@@ -31,12 +31,29 @@ module DcPageControl
 # Called when new empty record is created
 ######################################################################
 def dc_new_record()
-  @record.design_id = params[:design_id] if params[:design_id]
-  return unless params[:page_id]
-#
-  if page = DcPage.find(params[:page_id])
-    @record.design_id = page.design_id
-    @record.menu      = page.menu
+  # Called from menu. Fill in values, that could be obtained from menu
+  if params[:from_menu]
+    # find menu and submenu. Menu class is defined in Site.
+    menu_a = params[:id].split(';')
+    menu   = dc_get_site.menu_klass.find(menu_a.shift)
+    menu_items_method = "#{dc_get_site.menu_class}_items".underscore
+    menu_i = menu.send(menu_items_method).find(menu_a.shift)
+    while menu_a.size > 0 do menu_i = menu_i.send(menu_items_method).find(menu_a.shift) end
+    # Fill values for form
+    @record.subject = menu_i.caption    
+    @record.dc_site_id = menu.dc_site_id
+    @record.menu_id = params[:id]
+    # set update_menu on save parameter
+    params['p__update_menu'] = '1'
+  else
+    @record.design_id = params[:design_id] if params[:design_id]
+    return unless params[:page_id]
+    # inherit some values from currently active page
+    if page = DcPage.find(params[:page_id])
+      @record.design_id  = page.design_id
+      @record.menu       = page.menu
+      @record.dc_site_id = page.dc_site_id
+    end
   end
 end
 
@@ -44,8 +61,7 @@ end
 # Called just after record is saved to DB.
 ######################################################################
 def dc_after_save()
-  if params[:_record] and params[:_record][:_update_menu] == '1'
-#    menu_class = dc_get_site.menu_class.classify.constantize
+  if params.dig(:_record,:_update_menu).to_s == '1'
     dc_get_site.menu_klass.update_menu_item_link(@record)
   end
 end

data/app/controls/dc_poll_result_control.rb

@@ -0,0 +1,88 @@
+#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 DcPage model.
+######################################################################
+module DcPollResultControl
+
+######################################################################
+# Filter result data when filter is set
+######################################################################
+def poll_filter()
+  get_query
+end
+
+######################################################################
+# Filter action called. Update url to reflect filter conditions and reload form.
+######################################################################
+def do_filter
+  url = url_for(controller: :cmsedit, action: :index, table: :dc_poll_result,
+                'record[dc_poll_id]' => params[:record][:dc_poll_id],
+                'record[start_date]' => params[:record][:start_date],
+                'record[end_date]'   => params[:record][:end_date]
+               )
+  dc_render_ajax(operation: :url, value: url)
+end
+
+######################################################################
+# Export data to file
+######################################################################
+def do_export
+  c, keys = '', []
+  get_query.to_a.each do |doc|
+    # ensure, that fields are always in same order
+    data = YAML.load(doc.data)
+    if c.blank?
+      data.each {|k,v| keys << k}
+      c << I18n.t('helpers.label.dc_poll_result.created_at') + "\t"
+      c << keys.join("\t") + "\n"
+    end
+    c << doc.created_at.strftime(I18n.t('date.formats.default') ) + "\t"
+    keys.each {|k| c << data[k] + "\t"}
+    c << "\n"
+  end
+  File.write(Rails.root.join('public','export.csv'), c)
+  dc_render_ajax(operation: :window, value: 'export.csv')
+end
+
+private
+######################################################################
+# Creates query for Poll results
+######################################################################
+def get_query()
+  if params.dig(:record,:dc_poll_id).nil?
+    qry = DcPollResult.all
+  else  
+    qry = DcPollResult.where(dc_poll_id: params[:record][:dc_poll_id])
+    unless params[:record][:start_date].blank?
+      start_date = DrgcmsFormFields::DatePicker.get_data(params,'start_date').beginning_of_day
+      end_date   = DrgcmsFormFields::DatePicker.get_data(params,'end_date').end_of_day
+      qry = qry.and(:created_at.gt => start_date).and(:created_at.lt => end_date)
+    end
+  end
+  qry
+end
+
+end