drg_cms 0.6.0.8 → 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
@@ -125,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')
@@ -149,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
@@ -269,8 +269,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
 ########################################################################

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/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
 

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
@@ -196,7 +196,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

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_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,7 @@ form:
       10:
         name: dc_parts
         type: embedded
+        caption: false
         form_name: dc_part
         html:
           height: 1000

data/app/forms/dc_help_1.yml

@@ -0,0 +1,109 @@
+## Form for creating help files
+---
+table: dc_temp
+title: drgcms.dc_help.title
+control: dc_help
+
+index:
+  actions:
+
+    10:
+      type: field
+      name: select_project
+      field_type: select
+      caption: drgcms.dc_help.project
+      eval: DcHelpControl.choices_for_project
+      default:
+        eval: '@parent.session[:help_project]'
+
+    20:
+      type: field
+      name: lang_1
+      caption: drgcms.dc_help.lang
+      field_type: text_field
+      size: 5
+      default:
+        eval: '@parent.session[:help_lang]'
+      html:
+        placeholder: drgcms.dc_help.lang
+
+    50:
+      type: ajax
+      caption: drgcms.dc_help.project_refresh
+      title: drgcms.dc_help.project_refresh_title
+      icon: refresh
+      action: run
+      method: post
+      control: dc_help.project_refresh
+
+    60: new
+
+result_set:
+  filter: data_filter
+  actions:
+    1: edit
+  columns:
+    10:
+      name: form_name
+      caption: drgcms.dc_help.form_name
+      width: 10%
+    20:
+      name: lang
+      caption: drgcms.dc_help.lang
+      width: 10%
+    30:
+      name: updated_at
+      caption: drgcms.dc_help.updated_at
+      width: 10%
+      format: T
+
+form:
+  actions:
+    1: back
+    2: save
+
+  title:
+    edit: dc_help edit_title
+    show: dc_help show_title
+
+  tabs:
+    1basic:
+      caption: drgcms.dc_help.1basic
+      10:
+        name: project
+        type: readonly
+        size: 20
+      20:
+        name: form_name
+        caption: drgcms.dc_help.form_name
+        type: text_with_select
+        eval: DcHelpControl.choices_for_form_name(@parent.session)
+        size: 20
+        html:
+          minlength: 4
+      30:
+        name: lang
+        caption: drgcms.dc_help.lang
+        type: text_field
+        size: 2
+        html:
+          minlength: 2
+          maxlength: 2
+
+    2index:
+      caption: drgcms.dc_help.2index
+      10:
+        name: index
+        caption: false
+        line: top
+        type: html_field
+        options: "height: 600"
+
+    3form:
+      caption: drgcms.dc_help.3form
+      10:
+        name: form
+        caption: false
+        line: top
+        type: html_field
+        options: "height: 600"

data/app/forms/dc_journal.yml

@@ -14,9 +14,11 @@ result_set:
   columns:
     10: 
       name: operation
+      width: 10%
     15: 
       name: time
-    20: 
+      width: 10%
+    20:
       name: user_id
       eval: dc_name4_id,dc_user,first_name
     30: 

data/app/forms/dc_link.yml

@@ -51,7 +51,7 @@ form:
       name: page_id
       type: text_autocomplete
       table: 
-        eval: '@parent.session[:site_page_table]'
+        eval: '@parent.dc_get_site.page_class'
       search: subject
       size: 60
      

data/app/forms/dc_menu.yml

@@ -62,6 +62,7 @@ form:
       10:
         name: dc_menu_items
         type: embedded
+        caption: false
         form_name: dc_menu_item
         html:
           height: 1000
@@ -69,6 +70,7 @@ form:
     tab3:
       20:
         name: css
+        caption: false
         type: text_area
         html:
           size: 100x50