agile_rails 0.0.0.2 → 0.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18dcbd28e6f1f0d840016fadd4a0ffc75da43233dac60f772b67d36de0a9f534
-  data.tar.gz: 19c2c9e047772cf7e26ad2073093803f9dd090cde50090931041ba94dfcd5a54
+  metadata.gz: 0bd422185ce90e64f9e1df6198d36c58a7fe951c54e7ba874a99aa12d9c80bf3
+  data.tar.gz: 843970c74ad00cc5784620361886a4532637a746de2833a77691cbea5852f140
 SHA512:
-  metadata.gz: 3db8f8adb6b0e7c495cc43c2fe08e6f699ac69efda6371ff24cf9afe769b890637f4f962b3352501ab2d5fcdcaba147e6400411c27865af480df3582abb26a8c
-  data.tar.gz: 7824f2db93018f2f72f8247e76af3b3c83172be2a9a0b2ff9985199cc7ae219746af44cee0425261f263ae05dc3f4e5f8bc0ddc0e85a7795ed982c7e5a72d29e
+  metadata.gz: b06646b7230db54483a3164e8a1f06ab1fd74ed5713dc464067762d85008ac58a33de789980a5937cd3c7ede05392ede91c5d98c29b39d2d25b280914bf98577
+  data.tar.gz: 5ed95ba34ac30d4ca3d816fedf2220b569dd24036ba92a8c4c0f00d4d280dbdfb18313d1597fe61726b8625dc63c45a567bb67c9447b83f0b1c37f4b445781e1

data/README.md

@@ -249,7 +249,7 @@ agile_rails_html_editor gem.
 
 Installation
 ------------
-Go and [jumpstart](https://github.com/agile-rails/startup/README.md)
+Go and [jumpstart](https://github.com/agile-rails/startup)
 Intranet portal application with AgileRails in just few minutes.
 
 Compatibility

data/app/assets/javascripts/agile/agile.js

@@ -348,6 +348,10 @@ process_json_result = function(json) {
     case 'parenturl':
       parent.location.href = value;
       break;
+    case 'iframeurl':
+        let [iframe, url] = value.split(";");
+         document.getElementById(iframe).src = url
+        break;
     case 'alert':
       alert(value);
       break;
@@ -532,6 +536,7 @@ function handleIframeFocus(){
 
 var active_iframe = null;
  */
+let timeoutId = null;
 
 /*******************************************************************
  * Events start here
@@ -1008,7 +1013,33 @@ $(document).ready( function() {
     } 
   });
 
-/*******************************************************************
+  /*******************************************************************
+   * Help text is displayed as title when mouse hovered over label.
+   * This was not wery obvious so, help icon was added to label
+   * and help text is also displayed if user clicks on label text.
+   *******************************************************************/
+  $('.ar-form-label').on('click', function(e) {
+    let titleText = $(this).attr('title');
+    if (!titleText || titleText == ' ' ) return;
+
+    $('#popup')
+      .text(titleText)
+      .css({
+        left: e.pageX + 10 + 'px',
+        top: e.pageY + 10 + 'px',
+        display: 'block'
+      });
+    $('#popup').addClass('tooltip');
+
+    if (timeoutId) clearTimeout(timeoutId);
+    timeoutId = setTimeout(function () {
+      $('#popup').css({display: 'none'});
+      $('#popup').removeClass('tooltip');
+      timeoutId = null;
+    }, 3000);
+  });
+
+  /*******************************************************************
  * It is not possible to attach any data to submit button except the text
  * that is written on a button and it is therefore very hard to distinguish
  * which button was pressed when more than one button is present on a form.

data/app/assets/stylesheets/agile/agile.css

@@ -791,6 +791,19 @@ display: inline-table;
   margin-left: 4px;
 }
 
+.ar-form-label::after {
+  font-size: 0.9em;
+  content: '?';
+  color: #253858;
+  background-color: #E0EEFF;
+  border-radius: 10px;
+  padding: 0 6px;
+  border: 1px solid #E8EAEC;
+}
+
+.ar-form-label.no-help::after { display: none; }
+
+
 .ar-form-label label {
   padding: 0 4px;
   font-size: 1em;
@@ -1698,6 +1711,14 @@ font-size: 1.2em;
   cursor: pointer;
 }
 
+#popup.tooltip {
+  filter: none;
+  position: fixed;
+  border: 1px solid #666;
+  background: lemonchiffon;
+  z-index: 1000;
+}
+
 /************************** info popup *************************/
 #ar-document-info {
   position: absolute;

data/app/controllers/agile_controller.rb

@@ -173,6 +173,7 @@ def new
   # not authorized
   unless agile_user_can(ArPermission::CAN_CREATE)
     flash[:error] = t('agile.not_authorized')
+    logger.error("*******  #{t('agile.not_authorized')} #{session[:user_name]} #{AgileHelper.table_param(params)}")
     return index
   end
   create_new_empty_record()

data/app/controls/agile_report.rb

@@ -34,6 +34,15 @@ def new_record
   ArTemp.clear(temp_key) unless params[:clear].to_s == 'no'
 end
 
+######################################################################
+# Return url for report iframe with additional parameters. Use when you need
+# to send additional parameters to resulting iframe.
+######################################################################
+def report_url_for(params = {})
+  url = "if_ar_temp;/agile?field_name=ar_temp&iframe=if_ar_temp&table=ar_temp&form_name=#{@report_id}"
+  params.inject(url) { |r, v| "#{r}&#{v[0]}=#{v[1]}" }
+end
+
 ######################################################################
 # Will replace @form with @form['report'] if table=ar_temp.
 # Will load agile_report_defaults if table=ar_memory and actions are not present.

data/app/controls/ar_setup_control.rb

@@ -38,7 +38,6 @@ def update_form
       save_filter_value(filter, 'ar_setup', :filter)
     end
   end
-
   return unless params[:id]
 
   record = if params[:id].to_i.to_s == params[:id]
@@ -48,11 +47,11 @@ def update_form
            end
 
   unless agile_user_has_role?('admin')
-    @form['form'].delete('tabs')
+    @form['form']['tabs'] = {}
     @form['readonly'] = true unless record.editors.include?(session[:user_id])
   end
 
-  form = YAML.load(record.form) #rescue nil
+  form = YAML.load(record.form)
   if form.present?
     @form['form']['tabs'] ||= {}
     @form['form']['tabs'].merge!(form)

data/app/forms/ar_category_as_tree.yml

@@ -3,8 +3,7 @@
 extend: ar_category
 
 index:
-  actions:
-    10: /
+  actions: /
 
   data_set:
     type: method

data/app/helpers/agile_application_helper.rb

@@ -61,7 +61,7 @@ attr_reader :json_ld
 
 ############################################################################
 # When @env is present then helper methods are called from @env object otherwise
-# from self. 
+# from self.
 ############################################################################
 def _origin #:nodoc:
   @env || self
@@ -77,17 +77,17 @@ end
 
 ############################################################################
 # This is main method used for render parts of design into final HTML document.
-# 
+#
 # Parameters:
-# [renderer] String or Symbol. Class name (in lowercase) that will be used to render final HTML code. 
+# [renderer] String or Symbol. Class name (in lowercase) that will be used to render final HTML code.
 # If class name is provided without '_renderer' suffix it will be added automatically.
-# 
+#
 # When renderer has value :part, it is a shortcut for agile_render_part method which
 # is used to draw parts of layout on design.
-# 
+#
 # [opts] Hash. Additional options that are passed to method. Options are merged with
 # options set on site, design, page and passed to renderer object.
-# 
+#
 # Example:
 #    <%= agile_render(:ar_page, method: 'view', category: 'news') %>
 ############################################################################
@@ -123,7 +123,7 @@ end
 # Point is to define design once and replace some parts of design dynamically.
 # Design may be defined in site and design doc defines only parts that vary
 # from page to page.
-# 
+#
 # Example: As used in design.
 #    <%= agile_render_part(@main) %>
 #
@@ -140,8 +140,8 @@ def agile_render_part(part)
   # called. That is what is defined in second part of array.
   when part.instance_of?(Array)
     if @options.dig(:settings, part.first)
-      #TODO to be defined 
-    else  
+      #TODO to be defined
+    else
       result = part.last.call
       result.instance_of?(Array) ? result.first : result
     end
@@ -176,9 +176,9 @@ def agile_page_bottom
 end
 
 ############################################################################
-# Creates title div for AgileRails dialogs. Title may also contain pagination section on right side if 
+# Creates title div for AgileRails dialogs. Title may also contain pagination section on right side if
 # data_set is provided as parameter.
-# 
+#
 # Parameters:
 # [text] String. Title caption.
 # [data_set=nil] Document collection. If data_set is passed pagination links will be created.
@@ -224,7 +224,7 @@ end
 
 ############################################################################
 # Creates title for AgileRails new dialog
-# 
+#
 # Returns:
 # String. HTML code for title.
 ############################################################################
@@ -328,7 +328,7 @@ end
 
 ####################################################################
 # Returns flash messages formatted for display on message div.
-# 
+#
 # Returns:
 # String. HTML code formatted for display.
 ####################################################################
@@ -363,10 +363,10 @@ end
 ########################################################################
 # Decamelizes string. This probably doesn't work very good with non ascii chars.
 # Therefore it is very unwise to use non ascii chars for table (table) names.
-# 
-# Parameters: 
+#
+# Parameters:
 # [Object] model_string. String or model to be converted into decamelized string.
-# 
+#
 # Returns:
 # String. Decamelized string.
 ########################################################################
@@ -375,12 +375,12 @@ def decamelize_type(model_string)
 end
 
 ####################################################################
-# Returns validation error messages for the document (record) formatted for 
+# Returns validation error messages for the document (record) formatted for
 # display on message div.
-# 
-# Parameters: 
+#
+# Parameters:
 # [doc] Document. Document record which will be checked for errors.
-# 
+#
 # Returns:
 # String. HTML code formatted for display.
 ####################################################################
@@ -389,11 +389,11 @@ def agile_error_messages_for(doc)
 
   msgs = doc.errors.inject('') do |r, error|
     label = t("helpers.label.#{decamelize_type(doc.class)}.#{error.attribute}", error.attribute)
-    r + "<li>#{label} : #{error.message}</li>"
+    "#{r}<li>#{label} : #{error.message}</li>"
   end
 
   %(
-<div class="ar-form-error"> 
+<div class="ar-form-error">
   <h2>#{t('agile.errors_no')} #{doc.errors.size}</h2>
   <ul>#{msgs}</ul>
 </div>).html_safe
@@ -416,11 +416,11 @@ def agile_warning_messages_for(doc)
 
   msgs = doc.warnings.inject('') do |r, error|
     label = t("helpers.label.#{decamelize_type(doc.class)}.#{error.attribute}", error.attribute)
-    r + "<li>#{label} : #{error.message}</li>"
+    "#{r}<li>#{label} : #{error.message}</li>"
   end
 
   %(
-<div class="ar-form-warning"> 
+<div class="ar-form-warning">
   <h2>#{t('agile.warnings_no')} #{doc.warnings.size}</h2>
   <ul>#{msgs}</ul>
 </div>).html_safe
@@ -438,39 +438,39 @@ end
 
 ####################################################################
 # Will create HTML code required to create new document.
-# 
-# Parameters: 
+#
+# Parameters:
 # [opts] Hash. Optional parameters for url_for helper. These options must provide at least table and form_name
-# parameters. 
-# 
+# parameters.
+#
 # Example:
 #    if @opts[:edit_mode] > 1
 #      opts = {table: 'agile_page;agile_part', form_name: 'agile_part', ids: @doc.id }
 #      html += agile_link_for_create( opts.merge!({title: 'Add new part', 'agile_part.name' => 'initial name', 'agile_part.order' => 10}) )
 #    end
-# 
+#
 # Returns:
 # String. HTML code which includes add image and javascript to invoke new document create action.
 ####################################################################
 def agile_link_for_create(opts)
-  opts.stringify_keys!  
+  opts.stringify_keys!
   title = opts.delete('title') #
   title = t(title, title) if title
-  target = opts.delete('target')  || 'iframe_cms'
+  target = opts.delete('target') || 'iframe_cms'
   opts['form_name']  ||= opts['table'].to_s.split(';').last
   opts['action']       = :new
   opts['controller'] ||= :agile
   url_forward_params(opts)
   js = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
   agile_link_to(nil, _origin.mi_icon('plus-circle'), '#',
-             { onclick: js, title: title, alt: 'Create', class: 'ar-inline-link'}).html_safe
+                { onclick: js, title: title, alt: 'Create', class: 'ar-inline-link'}).html_safe
 end
 
 ####################################################################
 # Will create HTML code required to edit document.
-# 
-# Parameters: 
-# [opts] Hash. Optional parameters for url_for helper. These options must provide 
+#
+# Parameters:
+# [opts] Hash. Optional parameters for url_for helper. These options must provide
 # at least table, form_name and id parameters. Optional title, target and icon parameters
 # can be set.
 #
@@ -481,7 +481,7 @@ end
 # String. HTML code which includes edit image and javascript to invoke edit document action.
 ####################################################################
 def agile_link_for_edit(opts)
-  opts.stringify_keys!  
+  opts.stringify_keys!
   title  = opts.delete('title') #
   title  = t(title)
   target = opts.delete('target') || 'iframe_cms'
@@ -490,9 +490,9 @@ def agile_link_for_edit(opts)
   opts['action']     ||= 'edit'
   opts['form_name']  ||= opts['table'].to_s.split(';').last
 
-  js  = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
+  js = "$('##{target}').attr('src', '#{_origin.url_for(opts)}'); return false;"
   agile_link_to(nil, _origin.mi_icon(icon), '#',
-             { onclick: js, title: title, class: 'ar-inline-link', alt: 'Edit'})
+                { onclick: js, title: title, class: 'ar-inline-link', alt: 'Edit'})
 end
 
 ####################################################################
@@ -509,7 +509,7 @@ def agile_link_menu_tag(title) #:nodoc:
 )
 
   yield html
-  html + '</ul></dd></dl>'
+  "#{html}</ul></dd></dl>"
 end
 
 ####################################################################
@@ -529,15 +529,15 @@ end
 # * Edit advanced. Will create edit form for editing all document fields.
 # * New page. Will create new document and pass some initial data to it. Initial data is saved to cookie.
 # * New part. Will create new part of document.
-# 
+#
 # Parameters:
 # [opts] Hash. Optional parameters for url_for helper. These options must provide at least table and form_name
-# and id parameters. 
-# 
+# and id parameters.
+#
 # Example:
 #    html += agile_page_edit_menu() if @opts[:edit_mode] > 1
-# 
-# Returns: 
+#
+# Returns:
 # String. HTML code required for manipulation of currently processed document.
 ########################################################################
 def agile_page_edit_menu(opts = @opts)
@@ -550,8 +550,8 @@ def agile_page_edit_menu(opts = @opts)
   kukis = { "#{table}.ar_design_id" => page.ar_design_id,
             #            "#{table}.menu_id"      => page.menu_id,
             #            "#{table}.kats"         => page.kats,
-            "#{table}.page_id"      => page.id,
-            "#{table}.ar_site_id"   => _origin.site.id
+            "#{table}.page_id" => page.id,
+            "#{table}.ar_site_id" => _origin.site.id
   }
   _origin.cookies[:record] = Marshal.dump(kukis)
   title = "#{t('agile.edit')}: #{page.subject}"
@@ -568,17 +568,17 @@ def agile_page_edit_menu(opts = @opts)
     html += agile_link_for_edit1( opts[:edit_params], t('agile.edit_new_page') )
 
     opts[:edit_params].merge!(ids: page.id, form_name: 'agile_part', 'icon' => 'plus',
-                             table: "#{_origin.site.page_class.underscore};agile_part"  )
+                              table: "#{_origin.site.page_class.underscore};agile_part" )
     html + agile_link_for_edit1( opts[:edit_params], t('agile.edit_new_part') )
   end.html_safe
 end
 
 ########################################################################
-# Return page class model defined in site document page_class field. 
-# 
-# Used in forms, when method must be called from page model and model is overwritten by 
+# Return page class model defined in site document page_class field.
+#
+# Used in forms, when method must be called from page model and model is overwritten by
 # user's own model.
-# 
+#
 # Example as used on form:
 #    30:
 #      name: link
@@ -590,10 +590,10 @@ def agile_page_class
 end
 
 ########################################################################
-# Return menu class model defined in site document menu_class field. 
-# 
+# Return menu class model defined in site document menu_class field.
+#
 # Used in forms for providing menus class to the forms object.
-# 
+#
 # Example as used on form:
 #    30:
 #      name: menu_id
@@ -607,10 +607,10 @@ end
 ####################################################################
 # Parse site name from url and return ar_site document. Site document will be cached in
 # @site variable.
-# 
+#
 # If not in production environment and site document is not found
 # method will search for 'test' document and return ar_site document found in alias_for field.
-# 
+#
 # Returns:
 # ArSite. Site document.
 ####################################################################
@@ -635,7 +635,7 @@ end
 # Return array of policies defined in a site document formated to be used
 # as choices for select field. Method is used for selecting site policy where
 # policy for displaying data is required.
-# 
+#
 # Example (as used in forms):
 #    name: policy_id
 #    type: select
@@ -649,8 +649,8 @@ end
 ############################################################################
 # Returns list of all collections (tables) as array of choices for usage in select fields.
 # List is collected from agile_menu.yml files and may not include all collections used in application.
-# Currently list is only used for helping defining collection names on agile_permission form. 
-# 
+# Currently list is only used for helping defining collection names on agile_permission form.
+#
 # Example (as used in forms):
 #    form:
 #      fields:
@@ -714,14 +714,14 @@ def agile_application_menu
                        }
                 "<li>#{agile_link_to(t(option['caption']), option['icon'], opts)}</li>"
               end
-    end   
+    end
     html += '</ul></li>'
   end
   html.html_safe
 end
 
 ############################################################################
-# Returns list of directories as array of choices for use in select field 
+# Returns list of directories as array of choices for use in select field
 # on folder permission form. Directory root is determined from ar_site.files_directory field.
 ############################################################################
 def agile_choices_for_folders
@@ -735,15 +735,15 @@ end
 ############################################################################
 # Returns choices for select input field when choices are generated from
 # all documents in collection.
-# 
-# Parameters:  
+#
+# Parameters:
 # [model] String. Collection (table) name in lowercase format.
 # [name] String. Field name containing description text.
 # [id] String. Field name containing id field. Default is '_id'
 # [options] Hash. Various options. Currently site: (:only, :with_nil, :all) is used.
 # Will return only documents belonging to current site, also with site not defined,
 # or all documents.
-# 
+#
 # Example (as used in forms):
 #    50:
 #      name: agile_poll_id
@@ -755,7 +755,7 @@ def agile_choices_for(model, name, id = 'id', options = {})
   qry   = model.select(id, name)
   if (param = options[:site])
     sites = [agile_get_site.id] unless param == :all
-    sites << nil if param == :with_nil 
+    sites << nil if param == :with_nil
     qry   = qry.where(ar_site_id: sites) if sites
   end
   qry = qry.where(active: true) if model.has_attribute?(:active)
@@ -763,9 +763,9 @@ def agile_choices_for(model, name, id = 'id', options = {})
 end
 
 ############################################################################
-# Returns list of choices for selection top level menu on agile_page form. Used for defining which 
+# Returns list of choices for selection top level menu on agile_page form. Used for defining which
 # top level menu will be highlited when page is displayed.
-# 
+#
 # Example (as used in forms):
 #    20:
 #      name: menu_id
@@ -775,15 +775,15 @@ end
 def agile_choices_for_menu
   menu_class = agile_get_site.menu_class
   menu_class = 'ArMenu' if menu_class.blank?
-  klass  = menu_class.classify.constantize
+  klass = menu_class.classify.constantize
   klass.choices_for_menu(agile_get_site)
 end
 
 ############################################################################
-# Will add data to record cookie. Record cookie is used to preload some 
-# data on next create action. Create action will look for cookies[:record] and 
+# Will add data to record cookie. Record cookie is used to preload some
+# data on next create action. Create action will look for cookies[:record] and
 # if found initialize fields on form with matching name to value found in cookie data.
-# 
+#
 # Example:
 #    kukis = {'agile_page.ar_design_id' => @page.ar_design_id,
 #             'agile_page.agile_menu_id' => @page.menu_id)
@@ -801,21 +801,21 @@ end
 
 ############################################################################
 # Will check if user roles allow user to view data in document with defined access_policy.
-# 
+#
 # Parameters:
 # [ctrl] Controller object or object which holds methods to access environment. For example @env
 # when called from renderer.
-# [policy_id] Document or documents policy_id field value required to view data. Method will automatically 
+# [policy_id] Document or documents policy_id field value required to view data. Method will automatically
 # check if parameter send has policy_id field defined and use value of that field.
 #
 # Example:
-#    can_view, message = agile_user_can_view(@env, @page) 
+#    can_view, message = agile_user_can_view(@env, @page)
 #    # or
 #    can_view, message = agile_user_can_view(@env, @page.policy_id)
 #    return message unless can_view
 #
 # Returns:
-# True if access_policy allows user to view data. 
+# True if access_policy allows user to view data.
 # False and message from policy that is blocking view if access is not allowed.
 ############################################################################
 def agile_user_can_view(ctrl, policy_id)
@@ -870,12 +870,12 @@ end
 # [roles] Array of roles that will be searched. Default session[:user_roles].
 #
 # Example:
-#    if agile_user_has_role?('decision_maker', session[:user_id), session[:user_roles]) 
+#    if agile_user_has_role?('decision_maker', session[:user_id), session[:user_roles])
 #      do_something_important
 #    end
 #
 # Returns:
-# Boolean. True if user has required role.    
+# Boolean. True if user has required role.
 ####################################################################
 def agile_user_has_role?( role, user = nil, roles = nil )
   roles = _origin.session[:user_roles] if roles.nil?
@@ -892,11 +892,11 @@ end
 ####################################################################
 # Returns true if parameter has value of 0, false, no, none or -.
 # Returns value of default if parameter has nil value.
-# 
+#
 # Parameters:
-# [what] String/boolean/Integer. 
+# [what] String/boolean/Integer.
 # [default] Default value when what has value of nil. False by default.
-# 
+#
 # Example:
 #    agile_dont?('none')    # => true
 #    agile_dont?('-')       # => true
@@ -910,10 +910,10 @@ end
 ############################################################################
 # Truncates string length maximal to the size required and takes care, that words are not broken in middle.
 # Used for output text summary with texts that can be longer then allowed space.
-# 
+#
 # Parameters:
 # [string] String of any size.
-# [size] Maximal size of the string to be returned. 
+# [size] Maximal size of the string to be returned.
 #
 # Example:
 #    agile_limit_string(description, 100)
@@ -933,16 +933,16 @@ end
 # Returns key defined in ArBigTable as array of choices for use in select fields.
 # ArBigTable can be used like a key/value store for all kind of predefined values
 # which can be linked to site and or locale.
-# 
+#
 # Parameters:
 # [key] String. Key name to be searched in agile_big_tables documents.
-# 
+#
 # Example:
 #    10:
 #      name: category
 #      type: select
 #      eval: agile_big_table_choices 'categories_for_page'  # as used on form
-# 
+#
 # Returns:
 # Array of choices ready for select field.
 ############################################################################
@@ -965,12 +965,12 @@ end
 # Will return html code required for load AgileRails form into iframe. If parameters
 # are passed to method iframe url will have initial value and thus enabling automatic form
 # load on page display.
-# 
+#
 # Parameters:
 # [table] String: Collection (table) name used to load initial form.
 # [opts] Hash: Optional parameters which define url for loading AgileRails form.
 # These parameters are :action, :oper, :table, :form_name, :id, :readonly
-# 
+#
 # Example:
 #    # just iframe code
 #    <%= agile_edit_frame(nil) %>
@@ -978,13 +978,13 @@ end
 #    <%= agile_edit_frame('note', iframe: 'iframe_name') %>
 #    # on register collection use reg_adresses form_name to display data with id @register.id
 #    <%= agile_edit_frame('register', action: :show, form_name: 'reg_adresses', readonly: 1, id: @register.id ) %>
-# 
+#
 # Returns:
 # Html code for edit iframe
 ########################################################################
 def agile_edit_frame(table, opts = {})
   iframe_name = opts[:iframe] || 'iframe_edit'
-  if params.to_unsafe_h.size > 2 && table  # controller, action, path is minimal
+  if params.to_unsafe_h.size > 2 && table # controller, action, path is minimal
     params[:controller] = :agile
     params[:action]     = params[:oper] == 'edit' ? 'edit' : 'index'
     params[:action]     = opts[:action] unless params[:oper]
@@ -1035,19 +1035,20 @@ def agile_internal_var(object, var_name, current_record = nil)
       klas = clas.classify.constantize
       # call method. Error will be caught below.
       klas.send(method_name)
+    when 'eval' then eval("_origin.#{var_name}")
     else
       'VARIABLE: UNKNOWN OBJECT'
     end
   rescue Exception => e
-    Rails.logger.debug "\nagile_internal_var. Runtime error. #{e.message}\n"
-    Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
+    Rails.logger.error "\nagile_internal_var. Runtime error. #{e.message}\n"
+    Rails.logger.error(e.backtrace.join($/)) if Rails.env.development?
     'VARIABLE: ERROR'
   end
 end
 
 ########################################################################
 # Will return formated code for embedding json+ld data into page
-# 
+#
 # Returns:
 # HTML data to be embedded into page header
 #######################################################################
@@ -1078,7 +1079,7 @@ end
 
 ########################################################################
 # Will return meta data for SEO optimizations
-# 
+#
 # Returns:
 # HTML data to be embedded into page header
 #######################################################################
@@ -1096,7 +1097,7 @@ end
 ########################################################################
 # Will add a meta tag to internal hash structure. If meta tag already exists it
 # will be overwritten.
-# 
+#
 # Parameters:
 # [name] String: meta name
 # [content] String: meta content
@@ -1127,9 +1128,9 @@ end
 
 #######################################################################
 # Will return alt image option when text is provided. When text is blank
-# it will extract alt name from picture file_name. This method returns just 
+# it will extract alt name from picture file_name. This method returns just
 # alt name.
-# 
+#
 # Parameters:
 # [file_name] String: Filename of a picture
 # [text] String: Alt text name

data/app/helpers/agile_category_helper.rb

@@ -33,7 +33,7 @@ module AgileCategoryHelper
 def categories_as_tree
   head = '<div id="catagories-as-tree"><ul><li data-id="nil"><span class="mi-o mi-home"></span>'
   data = ArCategory.where(parent: nil).order(order: :asc).to_a
-  (head + html_for_category_tree(data) + '</li></ul></div>' + js_for_category_tree).html_safe
+  "#{head}#{html_for_category_tree(data)}</li></ul></div>#{js_for_category_tree}".html_safe
 end
 
 private
@@ -51,7 +51,7 @@ def html_for_category_tree(data)
     html += html_for_category_tree(children) if children.size > 0
     html += '</li>'
   end
-  html + '</ul>'
+  "#{html}</ul>"
 end
 
 ####################################################################

data/app/helpers/agile_edit_helper.rb

@@ -242,18 +242,17 @@ end
 # if value is found in values. If not it will report error and set value to default.
 # Subroutine of agile_fields_for_tab.
 ############################################################################
-def agile_check_and_default(value, default, values = nil) #:nodoc:
+def agile_check_and_default(value, default, values = nil) # :nodoc:
   return default if value.nil?
+
   # check if value is within allowed values
-  if values
-    if !values.index(value) 
-      # parameters should be in downcase. Check downcase version.
-      if n = values.index(value.downcase)
-        return values[n]
-      else
-        logger.error("AgileRails Forms: Value #{value} not within values [#{values.join(',')}]. Default #{default} used!")
-        return default
-      end
+  if values && !values.index(value)
+    # parameters should be in downcase
+    if n = values.index(value.downcase)
+      return values[n]
+    else
+      logger.error("AgileRails Forms: Value #{value} not within values [#{values.join(',')}]. Default #{default} used!")
+      return default
     end
   end
   value
@@ -263,12 +262,12 @@ end
 # Creates input fields defined in form options
 ############################################################################
 def agile_fields_for_form
-  html = "<div id='data_fields' " + (@form['form']['height'] ? "style=\"height: #{@form['form']['height']}px;\">" : '>')
+  html = '<div id="data_fields" ' + (@form['form']['height'] ? "style=\"height: #{@form['form']['height']}px;\">" : '>')
   @js  ||= ''
   @css ||= ''
   # fields
   if (form_fields = @form['form']['fields'])
-    html += agile_input_form(form_fields) + '</div>'
+    html += "#{agile_input_form(form_fields)}</div>"
   elsif @form['form']['tabs'] #tabs
     html = agile_tabs_form()
   end
@@ -277,7 +276,7 @@ def agile_fields_for_form
   # add form time stamp to prevent double form submit
   html += hidden_field(nil, :form_time_stamp, value: Time.now.to_i)
   # add javascript code if defined by form
-  @js += "\n#{@form['script']} #{@form['js']}"
+  @js  += "\n#{@form['script']} #{@form['js']}"
   @css += "\n#{@form['css']}\n#{@form['form']['css']}"
   html.html_safe
 end
@@ -307,7 +306,7 @@ def agile_head_for_form
     elsif options['name'] == caption
       t_label_for_field(options['name'], options['name'].capitalize.gsub('_',' ') )
     else
-      t(caption, caption) 
+      t(caption, caption)
     end
     # Field value
     begin
@@ -468,6 +467,7 @@ def agile_input_form(fields_on_tab) #:nodoc:
     end
     # label
     field_html, label, help = agile_field_label_help(options)
+    no_help = help.blank? ? ' no-help' : ''
     label = nil if agile_dont?(options['caption'])
     # Line separator
     html += agile_top_bottom_line(:top, options)
@@ -485,7 +485,7 @@ def agile_input_form(fields_on_tab) #:nodoc:
                            end
               label = label.nil? ? '' : %(<label for="record_#{options['name']}">#{label} </label>)
               %(
-<div class="ar-form-label-top ar-align-left ar-width-#{data_width}" title="#{help}">
+<div class="ar-form-label-top ar-align-left ar-width-#{data_width}#{no_help}" title="#{help}">
   #{label}
   <div id="td_record_#{options['name']}">#{field_html}</div>
 </div> )
@@ -504,7 +504,7 @@ def agile_input_form(fields_on_tab) #:nodoc:
               end
               help.gsub!('<br>',"\n") if help.present?
               %(
-<div class="ar-form-label ar-align-right ar-width-#{label_width}" title="#{help}">
+<div class="ar-form-label ar-align-right ar-width-#{label_width}#{no_help}" title="#{help}">
   <label for="record_#{options['name']}">#{label} </label>
 </div>
 <div id="td_record_#{options['name']}" class="ar-form-field ar-width-#{data_width}">#{field_html}</div>

data/app/helpers/agile_index_helper.rb

@@ -52,10 +52,8 @@ def agile_actions_for_index
 
   html_left, html_right = '', ''
   # Remove actions settings and sort
-  only_actions = []
-  actions.each { |key, value| only_actions << [key, value] if key.instance_of?(Integer) }
-  only_actions.sort_by!(&:first)
-  only_actions.each do |key, options|
+  only_actions = actions.select{ |k, v| k.instance_of?(Integer) }.sort_by(&:first).map(&:last)
+  only_actions.each do |options|
     next if options.nil? # must be
 
     url    = @form_params.clone
@@ -74,45 +72,48 @@ def agile_actions_for_index
     # html link options
     html_options = yaml['html'] || {}
     html_options['title'] = yaml['title'] if yaml['title']
-    case action
-    # new
-    when 'new'
-      caption = yaml['caption'] || 'agile.new'
-      html_options['class'] = 'ar-link'
-      html_left += "<li>#{agile_link_to(caption, 'add', url, html_options)}</li>"
-    # filter
-    when 'filter'
-      # filter off is not present
-      no_off = session.dig(:filters, @form['table'], :filter, :no_off)
-      next if no_off
-
-      url = ''
-      if session.dig(:filters, @form['table'], :filter)
-        url = url_for(controller: :agile, action: :run, control: 'agile.filter_off', t: @form['table'], f: AgileHelper.form_param(params))
-      end
-      html_right += %(
+    html = case action
+           # new
+           when 'new'
+             caption = yaml['caption'] || 'agile.new'
+             html_options['class'] = 'ar-link'
+             "<li>#{agile_link_to(caption, 'add', url, html_options)}</li>"
+
+           # filter
+           when 'filter'
+             # filter off is not present
+             no_off = session.dig(:filters, @form['table'], :filter, :no_off)
+             next if no_off
+
+             url = ''
+             if session.dig(:filters, @form['table'], :filter)
+               url = url_for(controller: :agile, action: :run, control: 'agile.filter_off', t: @form['table'], f: AgileHelper.form_param(params))
+             end
+             yaml['position'] ||= 'right'
+             %(
 <li>
   <div class="ar-filter" title="#{ArFilter.title_for_filter_off(session.dig(:filters, @form['table']))}" data-url="#{url.html_safe}">
     #{mi_icon(url.blank? ? 'search' : 'filter_alt_off') }#{ArFilter.filter_menu(self).html_safe}
   </div>
 </li>#{ArFilter.get_filter_input_field(self)}).html_safe
 
-    when 'close'
-      html_left += %(<li><div class="ar-link" onclick="window.close();"'>#{mi_icon('close')} #{t('agile.close')}</div></li>)
-
-    when 'back'
-      html_left += %(<li><div class="ar-link" onclick="history.back();"'>#{mi_icon('arrow_back')} #{t('agile.back')}</div></li>)
-
-    # menu
-    when 'menu'
-      code = if options['caption']
-               caption = "#{t(options['caption'], options['caption'])}&nbsp;#{mi_icon('caret-down')}"
-               caption + agile_process_eval(options['eval'], self)
-             else # when caption is false, provide own actions
-               agile_process_eval(options['eval'], self)
-             end
-      html_left += %(<li><div class="ar-link">#{code}</div></li>)
-
+           # close
+           when 'close'
+             %(<li><div class="ar-link" onclick="window.close();"'>#{mi_icon('close')} #{t('agile.close')}</div></li>)
+
+           # back
+           when 'back'
+             %(<li><div class="ar-link" onclick="history.back();"'>#{mi_icon('arrow_back')} #{t('agile.back')}</div></li>)
+
+           # menu
+           when 'menu'
+             code = if options['caption']
+                      caption = "#{t(options['caption'], options['caption'])}&nbsp;#{mi_icon('caret-down')}"
+                      caption + agile_process_eval(options['eval'], self)
+                    else # when caption is false, provide own actions
+                      agile_process_eval(options['eval'], self)
+                    end
+             %(<li><div class="ar-link">#{code}</div></li>)
 =begin
 # reorder      
     when action == 'reorder' then  
@@ -124,35 +125,42 @@ def agile_actions_for_index
       agile_link_to( caption, 'reorder', parms, method: :delete )              
 =end
 
-    when 'script'
-      html_left += agile_script_action(options)
+           when 'script'
+             agile_script_action(options)
 
-    when 'field'
-      if yaml['position'] == 'left'
-        html_left += agile_field_action(yaml)
-      else
-        html_right += agile_field_action(yaml)
-      end
+           when 'field'
+             yaml['position'] ||= 'right'
+             agile_field_action(yaml)
 
-    when 'ajax', 'link', 'window', 'popup', 'submit'
-      html_left += agile_link_ajax_window_submit_action(options, nil)
+           when 'ajax', 'link', 'window', 'popup', 'submit'
+             agile_link_ajax_window_submit_action(options, nil)
 
-    # sort
-    when 'sort'
-      choices = [%w[id id]]
-      @form['index']['sort']&.split(',')&.each do |e|
-          e.strip!
-          choices << [ t("helpers.label.#{@form['table']}.#{e}"), e ]
-        end
-      data = mi_icon('sort') + select('sort', 'sort', choices, { include_blank: true },
-                                      { class: 'ar-sort-select', 'data-table' => @form['table'], 'data-form' => AgileHelper.form_param(params)} )
-      html_right += %(<li title="#{t('agile.sort')}"><div class="ar-sort">#{data}</li>)
+           # sort
+           when 'sort'
+             yaml['position'] ||= 'right'
+             choices = [%w[id id]]
+             @form['index']['sort']&.split(',')&.each do |e|
+               e.strip!
+               choices << [t("helpers.label.#{@form['table']}.#{e}"), e]
+             end
+             data = mi_icon('sort') + select('sort', 'sort', choices, { include_blank: true },
+                                             { class: 'ar-sort-select', 'data-table' => @form['table'],
+                                               'data-form' => AgileHelper.form_param(params)})
+             %(<li title="#{t('agile.sort')}"><div class="ar-sort">#{data}</li>)
+
+           # link
+           else
+             caption = agile_get_caption(yaml) || t("agile.#{action}")
+             icon    = yaml['icon'] || action
+             html_options['class'] = 'ar-link'
+             code = agile_link_to(caption, icon, url, html_options)
+             html_left += %(<li>#{code}</li>)
+           end
+    yaml['position'] ||= 'left'
+    if yaml['position'] == 'left'
+      html_left += html
     else
-      caption = agile_get_caption(yaml) || t("agile.#{action}")
-      icon    = yaml['icon'] || action
-      html_options['class'] = 'ar-link'
-      code = agile_link_to(caption, icon, url, html_options)
-      html_left += %(<li>#{code}</li>)
+      html_right += html
     end
   end
 
@@ -166,7 +174,7 @@ def agile_actions_for_index
   </div>
 <div style="clear: both;"></div>
 </form>
-).html_safe
+  ).html_safe
 end
 
 ############################################################################
@@ -542,7 +550,6 @@ def agile_process_eval(evaluate, parameters)
 
   if method
     klass = clas.camelize.constantize rescue nil
-    p klass, clas
     return klass.send(method, *parameters) if klass&.respond_to?(method)
   end
   agile_log_exception(nil, "#{evaluate} not defined!")

data/app/models/agile_form_fields/datetime_picker.rb

@@ -79,7 +79,6 @@ end
 # DateTimePicker get_data method.
 ###########################################################################
 def self.get_data(params, name)
-  p params,'----------------------------------------------------'
   t = params['record'][name] ? params['record'][name].to_datetime : nil
   t ? Time.new(t.year, t.month, t.day, t.hour, t.min) : nil
 end

data/app/models/ar_image.rb

@@ -83,15 +83,9 @@ def validate_image_values
   end
 end
 
-#########################################################################
-# Will return first available image starting from small up
-#########################################################################
 def first_available_image
-  image = %w[o s m l].each do |size|
-    field = "size_#{size}"
-    value = send(field)
-    return "#{id}-#{size}.#{img_type}" if value.present?
-  end
+  image = %w[o s m l].find { send("size_#{_1}").present? }
+  image ? "#{id}-#{image}.#{img_type}" : nil
 end
 
 #########################################################################

data/app/models/ar_setup.rb

@@ -38,8 +38,7 @@
 ##############################################################################
 class ArSetup < ApplicationRecord
 
-attr_reader :my_data
-attr_reader :my_fields
+attr_reader :my_data, :my_fields
 
 validates_length_of :name, minimum: 3
 
@@ -97,12 +96,10 @@ def [](*keys)
 end
 
 ##############################################################################
-# Will return true if setting is defined on the form
+# Should always respond as true
 ##############################################################################
 def respond_to?(field_name)
-  return true #if my_fields[field_name.to_s]
-
-  super.respond_to?(field_name)
+  true
 end
 
 ##############################################################################

data/app/renderers/ar_poll_renderer.rb

@@ -26,8 +26,8 @@
 # is required in browser.
 ########################################################################
 class ArPollRenderer
-  
-include  AgileCommonHelper
+
+include AgileCommonHelper
 include AgileApplicationHelper
 include ActionView::Helpers::FormHelper # for form helpers
 include ActionView::Helpers::FormOptionsHelper # for select helper
@@ -64,13 +64,13 @@ def do_one_item(poll, yaml)
     yaml['html'] ||= {}
     yaml['html']['required'] = true
   else
-    text += "  " if poll.display == 'lr' and !yaml['type'].match(/submit_tag|link_to/)
+    text += '  ' if poll.display == 'lr' and !yaml['type'].match(/submit_tag|link_to/)
   end
 
   # Just add text if comment and go to next one
   if yaml['type'] == 'comment'
     html += if poll.display == 'lr'
-      "<div class='row-div'><div class='ar-form-label poll-data-text comment'>#{text}</div></div>"
+      "<div class='row-div'><div class='ar-form-label poll-data-text comment no_help'>#{text}</div></div>"
     else
       "<div class='poll-data-text comment'>#{text}</div>"
     end
@@ -97,17 +97,17 @@ def do_one_item(poll, yaml)
   # create form_field object and retrieve html code
   clas_string = yaml['type'].camelize
   field_html = if AgileFormFields.const_defined?(clas_string)
-    clas = AgileFormFields.const_get(clas_string)
-    field = clas.new(@env, @record, yaml).render
-    @part_js += field.js
-    field.html
-  else # error string
-    "Error: Code for field type #{yaml['type']} not defined!"
-  end
+                 clas  = AgileFormFields.const_get(clas_string)
+                 field = clas.new(@env, @record, yaml).render
+                 @part_js += field.js
+                 field.html
+               else # error string
+                 "Error: Code for field type #{yaml['type']} not defined!"
+               end
 
   if yaml['type'].match(/submit_tag|link_to/)
     # There can be more than one links on form. End the data at first link or submit.
-    if !@end_of_data
+    unless @end_of_data
       html += (poll.display == 'lr' ? "</div><br>\n" : "</div>\n")
       # captcha
       if poll.captcha_type.to_s.size > 1
@@ -124,12 +124,14 @@ def do_one_item(poll, yaml)
   # other fields
   else
     html += case
-      when poll.display == 'lr' then
-      "<div class='row-div'><div class='ar-form-label poll-data-text lr #{yaml['class']}'>#{text}</div><div class='poll-data-field td #{yaml['class']}'>#{field_html}</div></div>\n"
+      when poll.display == 'lr'
+        "<div class='row-div'><div class='ar-form-label poll-data-text lr #{yaml['class']} no_help'>#{text}</div>
+         <div class='poll-data-field td #{yaml['class']}'>#{field_html}</div></div>\n"
       when poll.display == 'td' then
-      "<div class='poll-data-text td #{yaml['class']}'>#{text}</div><div class='poll-data-field td #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+        "<div class='poll-data-text td #{yaml['class']}'>#{text}</div>
+         <div class='poll-data-field td #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
       else
-      "<div class='poll-data-field in #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
+        "<div class='poll-data-field in #{yaml['class']}'>#{field_html}#{yaml['separator']}</div>\n"
     end
   end
 end
@@ -216,6 +218,7 @@ def default
   if poll.form.to_s.size < 10
     poll.ar_poll_items.order(order: 'asc').each do |item|
       next unless item.active # disabled items
+
       # convert options to yaml
       begin
         yaml = YAML.load(item.options) || {}
@@ -242,14 +245,14 @@ def default
   end
   # hide some fields usefull as parameters
   html += @env.hidden_field_tag('return_to', @opts[:return_to] || @env.params[:return_to] || @env.request.url)
-  html += @env.hidden_field_tag('return_to_error', @env.request.url )
+  html += @env.hidden_field_tag('return_to_error', @env.request.url)
   html += @env.hidden_field_tag('poll_id', poll_id )
-  html += @env.hidden_field_tag('page_id', @env.page.id )
+  html += @env.hidden_field_tag('page_id', @env.page.id)
   # Add javascript code
   html += @env.javascript_tag(@part_js + poll.js.to_s)
-  html += "</form></div>"
+  html += '</form></div>'
   html += '</div>' if @opts[:div]
-  
+
   @part_css = poll.css
   html
 end

data/lib/agile/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2023+ Damjan Rems
+# Copyright (c) 2025+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,5 +23,5 @@
 
 # Agile gem version
 module Agile # :nodoc:
-  VERSION = '0.0.0.2'.freeze
+  VERSION = '0.0.0.3'.freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: agile_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.0.2
+  version: 0.0.0.3
 platform: ruby
 authors:
 - Damjan Rems
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails