redmine_extensions 0.3.7 → 0.4.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a09c29deceeb65baa0a4b83ea1546cdf8a316535ac6813777889b7aa45d0661
-  data.tar.gz: 2946755a797aea4a7b5d135d893cc67e6d1b352c565022553e35342c52f1f8a2
+  metadata.gz: 186ecf1e1604893d9fda643e2b589dbada90b4319c0da5d7a5c2c0f3c53eb176
+  data.tar.gz: f956c9668a5926ba5012902dfb2a1c88d2dd020f7ea06428310e3ef3963e9cff
 SHA512:
-  metadata.gz: bbf4463f41a86b822392978939c9902c31071e05745f419abc50ca1f2d893cd5c1098c009ac4361d3b3078fa6aa2a27710d7d9a7023c823bf4dd9dc908fd9d35
-  data.tar.gz: 354ce6a7fcd2d02b718e4642280083e4af5592be0542d92ce4a1142e4f53200c8ed53c22917c4e5d375a735396fb8358fe23315306699029b872c13583efdc4e
+  metadata.gz: ac84a447270e5d19538c99c5fc6d4dcd95ac936de8645c179ebd497d27d09ff65f2def4d24ee5f1b80aa9ac4d78289feca73edfe1242ac94d4a136e03dd50804
+  data.tar.gz: ca999dfd768ba7df0f23f45f5508136eeebd4b09fdef1a92383ec26d0c4d6e3d950252b420913e804eafde49498b00e55122773f490dfce1bb4b53a6de8ea7a4

data/app/assets/javascripts/redmine_extensions/redmine_extensions.js

@@ -88,9 +88,9 @@ EasyGem.schedule.require(function () {
       },
       activate_on_input_click: true,
       load_immediately: false,
-      show_toggle_button: true,
       select_first_value: true,
-      autocomplete_options: {}
+      autocomplete_options: {},
+      multiselectOnChange: null // onchange of multiselect input function
     },
 
     _create: function () {
@@ -102,7 +102,7 @@ EasyGem.schedule.require(function () {
       if (Array.isArray(this.options.source)) {
         this.options.preload = true;
         this._initData(this.options.source);
-      } else if (this.options.preload && this.options.load_immediately) {
+      } else if ( (this.options.preload || this.options.select_first_value) && this.options.load_immediately )  {
         this.load();
       } else if (this.selectedValues) {
         this.setValue(this.selectedValues);
@@ -119,9 +119,6 @@ EasyGem.schedule.require(function () {
         this.valueElement = $('<span></span>');
         this.tag.after(this.valueElement);
 
-        if (this.options.show_toggle_button)
-          this._createToggleButton();
-
         this.valueElement.entityArray({
           inputNames: this.inputName,
           afterRemove: function (entity) {
@@ -138,31 +135,11 @@ EasyGem.schedule.require(function () {
         this.element.css('margin-right', 0);
       }
     },
-
-    _createToggleButton: function () {
-      var that = this;
-      this.link_ac_toggle = $('<a>').attr('class', 'icon icon-add clear-link');
-      this.link_ac_toggle.click(function (evt) {
-        var $elem = $(this);
-        evt.preventDefault();
-        that.load(function () {
-          var select = $('<select>').prop('multiple', true).prop('size', 5).prop('name', that.inputName);
-          var option;
-          $.each(that.possibleValues, function (i, v) {
-            option = $('<option>').prop('value', v.id).text(v.value);
-            option.prop('selected', that.getValue().indexOf(v.id) > -1);
-            select.append(option);
-          });
-          var $container = $elem.closest('.easy-multiselect-tag-container');
-          $container.find(':input').prop('disabled', true);
-          $container.children().hide();
-          $container.append(select);
-          that.valueElement = select;
-          that.expanded = true;
-        });
-      });
-      this.element.parent().addClass('input-append');
-      this.element.after(this.link_ac_toggle);
+    setMultiselectOnChange: function (fn) {
+      this.options.multiselectOnChange = fn;
+    },
+    multiselectOnChange: function(select, fn) {
+      if (fn) select.on("change", fn);
     },
 
     _createAutocomplete: function () {
@@ -278,7 +255,7 @@ EasyGem.schedule.require(function () {
       this.valuesLoaded = true;
 
       this.selectedValues = this.selectedValues ? this.selectedValues : [];
-      if (this.selectedValues.length === 0 && this.options.preload && this.options.select_first_value && this.possibleValues.length > 0) {
+      if (this.selectedValues.length === 0 && this.options.select_first_value && this.possibleValues.length > 0) {
         this.selectedValues.push(this.possibleValues[0]['id']);
       }
 
@@ -373,7 +350,7 @@ EasyGem.schedule.require(function () {
       for (var i = values.length - 1; i >= 0; i--) {
         if (values[i] instanceof Object && !Array.isArray(values[i]) && values[i] !== null) {
           selected.push(values[i]);
-        } else if (this.options.preload) {
+        } else if (this.options.preload || this.options.select_first_value) {
           var that = this;
           if (!Array.isArray(that.possibleValues))
             return;

data/app/helpers/redmine_extensions/application_helper.rb

@@ -20,7 +20,7 @@ module RedmineExtensions
       else
         presenter = RedmineExtensions::BasePresenter.present(model, self, options)
       end
-      if block_given?
+      if block
         yield presenter
       else
         presenter
@@ -110,7 +110,7 @@ module RedmineExtensions
 
     def late_javascript_tag(content_or_options_with_block = nil, html_options = {}, &block)
       content =
-        if block_given?
+        if block
           html_options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
           capture(&block)
         else
@@ -183,8 +183,8 @@ module RedmineExtensions
 
       def container_class
         s = (@container_class.presence || css_classes[:container]).to_s
-        s << ' collapsible' if collapsible?
-        s << ' collapsed' if collapsed?
+        s += ' collapsible' if collapsible?
+        s += ' collapsed' if collapsed?
 
         s
       end
@@ -264,7 +264,6 @@ module RedmineExtensions
     # * +load_immediately+ - tells if values should be loaded immediatelly after page loaded, or wait for first use of the field.
     #                       Warning! if this option is false, selected values passed in first format will be ignored till it is loaded.
     #                         Please use second format for proper functionality.
-    # * +show_toggle_button+ - only valid with <tt>multiple: true, preload: true</tt> options set. Shows toggle button to expand select to the multiselect tag.
     # * +select_first_value+ - if selectd_values are empty, with this option first available value will be selected.
     #                          Available only with <tt>preload: true</tt> option.
     #                          With <tt>load_immediately: false</tt> it will appear kinda weird for user because it will select the value after user starts to interact with input.
@@ -272,7 +271,7 @@ module RedmineExtensions
     # * +rootElement+ - Has sence only if jsonpath is used for available values. It tells if the json response has values wrapped under root element.
     #                     For response like <tt>{projects: [[<name>, <id>], [<name2>, <id2>]]}</tt> user option <tt>rootElement: 'projects'</tt>
     def autocomplete_field_tag(name, jsonpath_or_array, selected_values, options = {})
-      options.reverse_merge!({select_first_value: false, show_toggle_button: false, load_immediately: false, preload: true, multiple: true, combo: false})
+      options.reverse_merge!({select_first_value: false, load_immediately: false, preload: true, multiple: true, combo: false})
       options[:id] ||= sanitize_to_id(name)
 
       selected_values ||= []
@@ -284,8 +283,8 @@ module RedmineExtensions
       end
 
       content_tag(:span, :class => 'easy-multiselect-tag-container') do
-        text_field_tag('', '', (options[:html_options] || {}).merge(id: options[:id])) +
-          late_javascript_tag("$('##{options[:id]}').easymultiselect({multiple: #{options[:multiple]}, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: #{options[:preload]}, combo: #{options[:combo]}, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
+        search_field_tag('', '', (options[:html_options] || {}).merge(id: options[:id])) +
+          late_javascript_tag("$('##{options[:id]}').easymultiselect({multiple: #{options[:multiple]}, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: #{options[:preload]}, combo: #{options[:combo]}, source: #{source}, selected: #{selected_values.to_json}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
       end
     end
 
@@ -297,13 +296,12 @@ module RedmineExtensions
     # HTML options can be passed as a hash with +html_options+. These options will be passed to the input element.
     #
     # ==== Examples
-    #   autocomplete_field(:issue, :tag_ids, Tag.all.pluck(:name, :id), multiple: true, show_toggle_button: true)
+    #   autocomplete_field(:issue, :tag_ids, Tag.all.pluck(:name, :id), multiple: true)
     #   # => <span class="easy-multiselect-tag-container"> \
     #         <input type="text" id="issue_tags"  /> \
     #         <button type="button" tabindex="-1" class="..." role="button" ...>
     #           <span class="ui-button-icon-primary ui-icon ui-icon-triangle-1-s"></span><span class="ui-button-text">&nbsp;</span>
     #         </button>
-    #         <a class="icon icon-add clear-link"></a> # toggle button to the multiselect tag from show_toggle_button option
     #         ...(wraping service tags)
     #           <input type="hidden" name="issue[tag_ids][]" value="#{@issue.tag_ids.first}" />
     #           <input type="hidden" name="issue[tag_ids][]" value="#{@issue.tag_ids.second}" />

data/app/models/easy_setting.rb

@@ -78,7 +78,7 @@ class EasySetting < ActiveRecord::Base
   @@mapper = EasySettings::Mapper.new
 
   def self.map(&block)
-    if block_given?
+    if block
       @@mapper.instance_eval(&block)
     else
       @@mapper

data/app/presenters/redmine_extensions/easy_setting_presenter.rb

@@ -119,7 +119,7 @@ module RedmineExtensions
     end
 
     def method_missing(meth, *attrs)
-      if @plugin && @plugin.settings[:easy_settings] && @plugin.settings[:easy_settings].keys.include?(meth.to_sym)
+      if @plugin && @plugin.settings[:easy_settings] && @plugin.settings[:easy_settings].key?(meth.to_sym)
         EasySetting.value(prefix+meth.to_s, project_id)
       else
         super

data/lib/generators/redmine_extensions/entity/entity_generator.rb

@@ -385,7 +385,7 @@ module RedmineExtensions
     end
 
     def name_column
-      'name' if string_columns.keys.include?('name')
+      'name' if string_columns.key?('name')
       string_columns.keys.first
     end
 
@@ -394,7 +394,7 @@ module RedmineExtensions
     end
 
     def description_column
-      'description' if text_columns.keys.include?('description')
+      'description' if text_columns.key?('description')
       text_columns.keys.first
     end
 

data/lib/generators/redmine_extensions/entity/templates/_form.html.erb.erb

@@ -1,38 +1,38 @@
 <%%= fields_for :<%= model_name_underscored %>, <%= model_name_underscored %> do |f| %>
   <%- if project? -%>
   <%% if <%= model_name_underscored %>.safe_attribute?('project_id') && !@project %>
-  <p>
-    <%%= f.label :project_id, ::<%= model_name %>.human_attribute_name(:project_id) %>
-    <%%= f.select :project_id, Project.allowed_to(:manage_<%= model_name_pluralize_underscored %>).collect{|x| [x.name, x.id]}, include_blank: true %>
-  </p>
+    <p>
+      <%%= f.label :project_id, ::<%= model_name %>.human_attribute_name(:project_id) %>
+      <%%= f.select :project_id, Project.allowed_to(:manage_<%= model_name_pluralize_underscored %>).collect{|x| [x.name, x.id]}, include_blank: true %>
+    </p>
   <%% end %>
   <%- end -%>
   <%- safe_columns.each do |column_name, column_options| -%>
   <%% if <%= model_name_underscored %>.safe_attribute?('<%= column_name %>') %>
-  <p>
-    <%%= f.label :<%= column_name %>, ::<%= model_name %>.human_attribute_name(:<%= column_name %>) %>
-    <%- if column_options[:query_type] == 'string' || column_options[:query_type] == 'integer' -%>
-    <%%= f.text_field :<%= column_name %> %>
-    <%- elsif column_options[:query_type] == 'list' || column_options[:query_type] == 'list_optional' -%>
-    <%%= f.select :<%= column_name %>, <%= column_options[:class] %>.all.collect{|x| [x.<%= column_options[:list_class_name] %>, x.id]}.sort, include_blank: true %>
-    <%- elsif column_options[:query_type] == 'text' -%>
-    <%%= f.text_area :<%= column_name %>, :cols => 60, :rows => (<%= model_name_underscored %>.<%= column_name %>.blank? ? 10 : [[10, <%= model_name_underscored %>.<%= column_name %>.length / 50].max, 100].min), :accesskey => accesskey(:edit), :class => 'wiki-edit' %>
-    <%%= wikitoolbar_for '<%= model_name_underscored %>_<%= column_name %>' %>
-    <%- elsif column_options[:query_type] == 'boolean' -%>
-    <%%= f.radio_button :<%= column_name %>, false %>
-    <%- else -%>
-    <%%= f.text_field :<%= column_name %> %>
-    <%- end -%>
-  </p>
+    <p>
+      <%%= f.label :<%= column_name %>, ::<%= model_name %>.human_attribute_name(:<%= column_name %>) %>
+      <%- if column_options[:query_type] == 'string' || column_options[:query_type] == 'integer' -%>
+      <%%= f.text_field :<%= column_name %> %>
+      <%- elsif column_options[:query_type] == 'list' || column_options[:query_type] == 'list_optional' -%>
+      <%%= f.select :<%= column_name %>, <%= column_options[:class] %>.all.collect{|x| [x.<%= column_options[:list_class_name] %>, x.id]}.sort, include_blank: true %>
+      <%- elsif column_options[:query_type] == 'text' -%>
+      <%%= f.text_area :<%= column_name %>, cols: 60, rows: (<%= model_name_underscored %>.<%= column_name %>.blank? ? 10 : [[10, <%= model_name_underscored %>.<%= column_name %>.length / 50].max, 100].min), accesskey: accesskey(:edit), class: 'wiki-edit' %>
+      <%%= wikitoolbar_for '<%= model_name_underscored %>_<%= column_name %>' %>
+      <%- elsif column_options[:query_type] == 'boolean' -%>
+      <%%= f.radio_button :<%= column_name %>, false %>
+      <%- else -%>
+      <%%= f.text_field :<%= column_name %> %>
+      <%- end -%>
+    </p>
   <%% end %>
   <%- end -%>
   <% associations.each do |assoc| %>
     <%- next if assoc[1][:type] == 'has_many' -%>
     <% association_name = assoc[0] %>
-    <p>
-      <%%= f.label l(:label_<%= association_name %>) %>
-      <%%= f.select :<%= association_name %>_id, <%= association_name.camelcase %>.visible.sorted.map{ |<%= association_name %>| [<%= association_name %>.to_s, <%= association_name %>.id]} %>
-    </p>
+      <p>
+        <%%= f.label l(:label_<%= association_name %>) %>
+        <%%= f.select :<%= association_name %>_id, <%= association_name.camelcase %>.visible.sorted.map{ |<%= association_name %>| [<%= association_name %>.to_s, <%= association_name %>.id]} %>
+      </p>
   <% end %>
   <%- if acts_as_customizable? -%>
   <%% custom_field_values = <%= model_name_underscored %>.visible_custom_field_values %>
@@ -43,6 +43,9 @@
   <%% end %>
   <%- end -%>
   <%- if acts_as_attachable? -%>
-  <p id="attachments_form"><label><%%= l(:label_attachment_plural) %></label><%%= render :partial => 'attachments/form', :locals => {:container => <%= model_name_underscored %>} %></p>
+  <p id="attachments_form">
+    <label><%%= l(:label_attachment_plural) %></label>
+    <%%= render partial: 'attachments/form', locals: { container: <%= model_name_underscored %> } %>
+  </p>
   <%- end -%>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/_list.html.erb.erb

@@ -1,5 +1,5 @@
-<%%= form_tag({}, :data => {:cm_url => context_menu_<%= model_name_pluralize_underscored %>_path}) do -%>
-  <%%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
+<%%= form_tag({}, data: {cm_url: context_menu_<%= model_name_pluralize_underscored %>_path}) do %>
+  <%%= hidden_field_tag 'back_url', url_for(params: request.query_parameters), id: nil %>
   <div class="autoscroll">
     <table class="list odd-even entities">
       <thead>
@@ -15,55 +15,56 @@
         </tr>
       </thead>
       <tbody>
-        <%% grouped_query_results(entities, @query) do |entity, group_name, group_count, group_totals| -%>
-        <%% if group_name %>
-          <%% reset_cycle %>
-          <tr class="group open">
-            <td colspan="<%%= @query.inline_columns.size + 2 %>">
-              <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
-              <span class="name"><%%= group_name %></span>
-              <%% if group_count %>
-              <span class="count"><%%= group_count %></span>
-              <%% end %>
-              <span class="totals"><%%= group_totals %></span>
-              <%%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
-              "toggleAllRowGroups(this)", class: 'toggle-all') %>
-            </td>
-          </tr>
-        <%% end %>
-        <tr id="entity_id_<%%= entity.id %>" class="entity <%%= cycle('odd', 'even') %> hascontextmenu">
-          <td class="checkbox hide-when-print"><%%= check_box_tag("ids[]", entity.id, false, id: nil) %></td>
-          <%% @query.inline_columns.each do |column| %>
-            <%%= content_tag('td', column_content(column, entity), class: column.css_classes) %>
+        <%% grouped_query_results(entities, @query) do |entity, group_name, group_count, group_totals| %>
+          <%% if group_name %>
+            <%% reset_cycle %>
+            <tr class="group open">
+              <td colspan="<%%= @query.inline_columns.size + 2 %>">
+                <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
+                <span class="name"><%%= group_name %></span>
+                <%% if group_count %>
+                <span class="count"><%%= group_count %></span>
+                <%% end %>
+                <span class="totals"><%%= group_totals %></span>
+                <%%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
+                'toggleAllRowGroups(this)', class: 'toggle-all') %>
+              </td>
+            </tr>
           <%% end %>
-          <td class="buttons">
-            <%% if entity.editable_by?(User.current) -%>
-            <%%= link_to l(:button_edit), edit_<%= model_name_underscored %>_path(entity),
-            title: l(:button_edit),
-            class: 'icon-only icon-edit' %>
-            <%%= link_to l(:button_delete), <%= model_name_underscored %>_path(entity),
-            data: {confirm: l(:text_are_you_sure)},
-            method: :delete,
-            title: l(:button_delete),
-            class: 'icon-only icon-del' %>
-            <%% end -%>
-          </td>
-        </tr>
-        <%% @query.block_columns.each do |column|
-        if (text = column_content(column, entity)) && text.present? -%>
-          <tr class="<%%= current_cycle %>">
-            <td colspan="<%%= @query.inline_columns.size + 1 %>" class="<%%= column.css_classes %>">
-              <%% if query.block_columns.count > 1 %>
-              <span><%%= column.caption %></span>
+          <tr id="entity_id_<%%= entity.id %>" class="entity <%%= cycle('odd', 'even') %> hascontextmenu">
+            <td class="checkbox hide-when-print"><%%= check_box_tag('ids[]', entity.id, false, id: nil) %></td>
+            <%% @query.inline_columns.each do |column| %>
+              <%%= content_tag('td', column_content(column, entity), class: column.css_classes) %>
+            <%% end %>
+            <td class="buttons">
+              <%% if entity.editable_by?(User.current) %>
+              <%%= link_to l(:button_edit), edit_<%= model_name_underscored %>_path(entity),
+                           title: l(:button_edit),
+                           class: 'icon-only icon-edit' %>
+              <%%= link_to l(:button_delete), <%= model_name_underscored %>_path(entity),
+                           data: {confirm: l(:text_are_you_sure)},
+                           method: :delete,
+                           title: l(:button_delete),
+                           class: 'icon-only icon-del' %>
               <%% end %>
-              <%%= text %>
             </td>
           </tr>
-          <%% end -%>
-        <%% end -%>
-        <%% end -%>
+          <%% @query.block_columns.each do |column| %>
+            <%% if (text = column_content(column, entity)) && text.present? %>
+              <tr class="<%%= current_cycle %>">
+                <td colspan="<%%= @query.inline_columns.size + 1 %>" class="<%%= column.css_classes %>">
+                  <%% if query.block_columns.count > 1 %>
+                  <span><%%= column.caption %></span>
+                  <%% end %>
+                  <%%= text %>
+                </td>
+              </tr>
+            <%% end %>
+          <%% end %>
+        <%% end %>
       </tbody>
     </table>
   </div>
-  <%% end -%>
-<%%= context_menu %>
+<%% end %>
+
+<%%= context_menu %>

data/lib/generators/redmine_extensions/entity/templates/_sidebar.html.erb.erb

@@ -1,9 +1,9 @@
 <ul>
-<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
-  <li><%%= link_to l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit button' %></li>
-<%% end %>
-<%% if @<%= model_name_underscored %>.nil? %>
-  <li><%%= link_to l(:button_<%= model_name_underscored %>_new), new_polymorphic_path([@project, :<%= model_name_underscored %>]), title: l(:title_<%= model_name_underscored %>_new), class: 'icon icon-add button button-positive' %></li>
-<%% end %>
-  <li><%%= link_to l(:label_<%= model_name_pluralize_underscored %>), polymorphic_path([@project, :<%= model_name_pluralize_underscored %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder button' %></li>
-</ul>
+  <%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
+    <%%= content_tag(:li, link_to(l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit button')) %>
+  <%% end %>
+  <%% if @<%= model_name_underscored %>.nil? %>
+    <%%= content_tag(:li, link_to(l(:button_<%= model_name_underscored %>_new), new_polymorphic_path([@project, :<%= model_name_underscored %>]), title: l(:title_<%= model_name_underscored %>_new), class: 'icon icon-add button button-positive'))
+  <%% end %>
+  <%%= content_tag(:li, link_to(l(:label_<%= model_name_pluralize_underscored %>), polymorphic_path([@project, :<%= model_name_pluralize_underscored %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder button')) %>
+</ul>

data/lib/generators/redmine_extensions/entity/templates/context_menu.html.erb.erb

@@ -1,21 +1,20 @@
 <ul>
-<%% if @<%= model_name_underscored %> -%>
-  <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
-<%% end %>
-<%% if @safe_attributes.include? 'status' -%>
+  <%% if @<%= model_name_underscored %> %>
+    <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
+  <%% end %>
+  <%% if @safe_attributes.include? 'status' %>
   <li class="folder">
-    <a href="#" class="submenu icon icon-issue-status" onclick="return false;"><%%= l(:field_status) -%></a>
+    <a href="#" class="submenu icon icon-issue-status" onclick="return false;"><%%= l(:field_status) %></a>
     <ul>
-      <%% <%= model_name %>.statuses.keys.each do |s| -%>
+      <%% <%= model_name %>.statuses.keys.each do |status| %>
         <li>
-          <%%= context_menu_link l("<%= model_name_underscored %>.statuses.#{s}"), bulk_update_<%= model_name_underscored %>_path(id: @<%= model_name_underscored %>_ids, <%= model_name_underscored %>: {status: s}, back_url: @back), method: :put,
-                                  selected: (@selected[:status] == s), disabled: !@can[:edit], confirm: l(:text_are_you_sure) %>
+          <%%= context_menu_link l("<%= model_name_underscored %>.statuses.#{status}"), bulk_update_<%= model_name_underscored %>_path(id: @<%= model_name_underscored %>_ids, <%= model_name_underscored %>: { status: status }, back_url: @back), method: :put, selected: (@selected[:status] == status), disabled: !@can[:edit], confirm: l(:text_are_you_sure) %>
         </li>
-      <%% end -%>
+      <%% end %>
     </ul>
   </li>
   <%% end %>
-  <li><%%= context_menu_link l(:button_delete), <%= model_name_underscored %>_path(id: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-del', disabled: !@can[:delete] %></li>
+  <li><%%= context_menu_link l(:button_delete), <%= model_name_underscored %>_path(id: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: { confirm: l(:text_are_you_sure) }, class: 'icon icon-del', disabled: !@can[:delete] %></li>
 
-  <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, {<%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project}) %>
+  <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, { <%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project }) %>
 </ul>

data/lib/generators/redmine_extensions/entity/templates/edit.html.erb.erb

@@ -1,6 +1,6 @@
 <%%= title l(:heading_<%= model_name_underscored %>_edit) %>
 
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
+<%%= form_for([@project, @<%= model_name_underscored %>], html: { multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr? }) do |f| %>
   <%%= error_messages_for @<%= model_name_underscored %> %>
 
   <div class="box">
@@ -15,5 +15,5 @@
 <%% end %>
 <%% ### PAGE CUSTOMS ########################################################## %>
 <%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
-<%% end %>
+  <%%= render partial: '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%% end %>

data/lib/generators/redmine_extensions/entity/templates/edit.js.erb.erb

@@ -2,14 +2,14 @@ var modal = $("#ajax-modal");
 modal.html("<%%= j render(template: '<%= model_name_pluralize_underscored %>/edit', formats: [:html]) %>");
 showModal(modal.attr("id"));
 var submitButton = {
-  text:"<%%=j l(:button_update) -%>",
-  title:"<%%=j l(:button_update) -%>",
+  text:"<%%=j l(:button_update) %>",
+  title:"<%%=j l(:button_update) %>",
   click: function() {$(this).find('form').submit()},
   'class': 'button-positive'
 };
 var closeButton = {
-  text: "<%%=j l(:button_close) -%>",
-  title: "<%%=j l(:button_close) -%>",
+  text: "<%%=j l(:button_close) %>",
+  title: "<%%=j l(:button_close) %>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
 };

data/lib/generators/redmine_extensions/entity/templates/index.api.rsb.erb

@@ -1,3 +1,3 @@
 api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
-  render(@entities, {api: api})
-end
+  render(@entities, { api: api })
+end

data/lib/generators/redmine_extensions/entity/templates/index.html.erb.erb

@@ -4,7 +4,7 @@
 <%%= context_menu context_menu_<%= model_name_pluralize_underscored %>_path(project_id: @project) %>
 <%% content_for :sidebar do %>
   <%%= render partial: '<%= model_name_pluralize_underscored %>/sidebar' %>
-  <%%= render partial: 'sidebar/saved_easyqueries_by_type', locals: {query_class: @query.class, project: @project} %>
+  <%%= render partial: 'sidebar/saved_easyqueries_by_type', locals: { query_class: @query.class, project: @project } %>
 <%% end %>
 <% else %>
 <div class="contextual">
@@ -27,4 +27,4 @@
     <span class="pagination"><%%= pagination_links_full @entity_pages, @entity_count %></span>
   <%% end %>
 <%% end %>
-<% end %>
+<% end %>

data/lib/generators/redmine_extensions/entity/templates/index.js.erb.erb

@@ -2,8 +2,8 @@ var modal = $("#ajax-modal");
 modal.html("<%%= j render(template: '<%= model_name_pluralize_underscored %>/index', formats: [:html]) %>");
 showModal(modal.attr("id"));
 var closeButton = {
-  text: "<%%=j l(:button_close) -%>",
-  title: "<%%=j l(:button_close) -%>",
+  text: "<%%=j l(:button_close) %>",
+  title: "<%%=j l(:button_close) %>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
 };

data/lib/generators/redmine_extensions/entity/templates/new.html.erb.erb

@@ -1,10 +1,10 @@
 <%%= title l(:heading_<%= model_name_underscored %>_new) %>
 
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
+<%%= form_for([@project, @<%= model_name_underscored %>], html: { multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr? }) do |f| %>
   <%%= error_messages_for @<%= model_name_underscored %> %>
 
   <div class="box">
-    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
+    <%%= render partial: 'form', locals: { <%= model_name_underscored %>: @<%= model_name_underscored %> } %>
   </div>
 
   <%% if !request.xhr? %>
@@ -15,5 +15,5 @@
 <%% end %>
 <%% ### PAGE CUSTOMS ########################################################## %>
 <%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
-<%% end %>
+  <%%= render partial: '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%% end %>

data/lib/generators/redmine_extensions/entity/templates/new.js.erb.erb

@@ -2,14 +2,14 @@ var modal = $("#ajax-modal");
 modal.html("<%%= j render(template: '<%= model_name_pluralize_underscored %>/new', formats: [:html]) %>");
 showModal(modal.attr("id"));
 var submitButton = {
-  text:"<%%=j l(:button_create) -%>",
-  title:"<%%=j l(:button_create) -%>",
+  text:"<%%=j l(:button_create) %>",
+  title:"<%%=j l(:button_create) %>",
   click: function() {$(this).find('form').submit()},
   'class': 'button-positive'
 };
 var closeButton = {
-  text: "<%%=j l(:button_close) -%>",
-  title: "<%%=j l(:button_close) -%>",
+  text: "<%%=j l(:button_close) %>",
+  title: "<%%=j l(:button_close) %>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
 };

data/lib/generators/redmine_extensions/entity/templates/show.html.erb.erb

@@ -22,9 +22,9 @@
     <%% end %>
     <%- if acts_as_customizable? -%>
       <hr />
-    <%%= render partial: 'redmine_extensions/custom_field_rows', :locals => { :custom_field_values => @<%= model_name_underscored %>.visible_custom_field_values } %>
+    <%%= render partial: 'redmine_extensions/custom_field_rows', locals: { custom_field_values: @<%= model_name_underscored %>.visible_custom_field_values } %>
     <%- end -%>
-    <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_show_details_bottom, :<%= model_name_underscored %> => @<%= model_name_underscored %>) %>
+    <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_show_details_bottom, :<%= model_name_underscored%>: @<%= model_name_underscored %>) %>
   </table>
 <%- if description_column? -%>
   <%% if !@<%= model_name_underscored %>.<%= description_column %>.blank? %>
@@ -38,13 +38,13 @@
   <%% end %>
 <%- end -%>
 <%- if acts_as_attachable? -%>
-  <%% if @<%= model_name_underscored %>.attachments.any? -%>
+  <%% if @<%= model_name_underscored %>.attachments.any? %>
     <hr />
-    <%%= link_to_attachments @<%= model_name_underscored %>, :thumbnails => true %>
+    <%%= link_to_attachments @<%= model_name_underscored %>, thumbnails: true %>
   <%% end %>
 <%- end -%>
 </div>
 <%% ### PAGE CUSTOMS ########################################################## %>
 <%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
-<%% end %>
+  <%%= render partial: '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%% end %>

data/lib/generators/redmine_extensions/entity/templates/show.js.erb.erb

@@ -2,8 +2,8 @@ var modal = $("#ajax-modal");
 modal.html("<%%= j render(template: '<%= model_name_pluralize_underscored %>/show', formats: [:html]) %>");
 showModal(modal.attr("id"));
 var closeButton = {
-  text: "<%%=j l(:button_close) -%>",
-  title: "<%%=j l(:button_close) -%>",
+  text: "<%%=j l(:button_close) %>",
+  title: "<%%=j l(:button_close) %>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
 };

data/lib/redmine_extensions/easy_query_helpers/outputs.rb

@@ -69,12 +69,12 @@ module RedmineExtensions
       end
 
       def render_edit
-        outputs.map{ |output| output.render_edit }.join('').html_safe
+        outputs.map{ |output| output.render_edit }.join.html_safe
       end
 
       def render_data
         if outputs.any?
-          outputs.map{ |output| output.render_data }.join('').html_safe
+          outputs.map{ |output| output.render_data }.join.html_safe
         else
           view_context.l(:label_no_output)
         end

data/lib/redmine_extensions/easy_settings/mapper.rb

@@ -10,7 +10,7 @@ module EasySettings
     def key(name, **options, &block)
       name = name.to_s
 
-      if block_given?
+      if block
         key_dsl = EasySettings::KeyDSL.new
         key_dsl.instance_eval(&block)
         options = options.merge(key_dsl.options)

data/lib/redmine_extensions/engine.rb

@@ -20,11 +20,13 @@ module RedmineExtensions
     config.eager_load_paths << config.root.join('app', 'models', 'easy_queries')
 
     initializer 'redmine_extensions.assets' do
-      config.assets.precompile << 'redmine_extensions/applications.js'
-      config.assets.precompile << 'redmine_extensions/blocking.js'
-      unless Rails.env.production?
-        config.assets.precompile << 'redmine_extensions/jasmine_lib/jasmine_lib.js'
-        config.assets.precompile << 'redmine_extensions/jasmine.css'
+      if config.respond_to?(:assets)
+        config.assets.precompile << 'redmine_extensions/applications.js'
+        config.assets.precompile << 'redmine_extensions/blocking.js'
+        unless Rails.env.production?
+          config.assets.precompile << 'redmine_extensions/jasmine_lib/jasmine_lib.js'
+          config.assets.precompile << 'redmine_extensions/jasmine.css'
+        end
       end
     end
 
@@ -61,7 +63,7 @@ module RedmineExtensions
 
     # include helpers
     initializer 'redmine_extensions.rails_patching', before: :load_config_initializers do |app|
-      ActiveSupport.on_load(Rails.version.start_with?('5') ? :action_controller_base : :action_controller) do
+      ActiveSupport.on_load(Rails::VERSION::MAJOR >= 5 ? :action_controller_base : :action_controller) do
         helper RedmineExtensions::ApplicationHelper
         # helper RedmineExtensions::EasyQueryHelper
       end

data/lib/redmine_extensions/migration.rb

@@ -1,5 +1,5 @@
 module RedmineExtensions
-  if Rails.version.start_with?('5')
+  if Rails::VERSION::MAJOR >= 5
     class Migration < ActiveRecord::Migration[4.2]
     end
   else

data/lib/redmine_extensions/patch_manager.rb

@@ -57,7 +57,7 @@ module RedmineExtensions
         @@patches_locations[patching_module] = const.methods(false).map{|m| const.method(m) }.first.source_location.first
       rescue
         # [0] is register_*_patch
-        from_location = caller_locations[1]
+        from_location = caller_locations(2..2).first
         @@patches_locations[patching_module] = from_location.absolute_path
       end
 
@@ -78,7 +78,7 @@ module RedmineExtensions
       end
       section ||= :others
 
-      raise ArgumentError, "EasyPatchManager->register_patch: The section (#{section}) must be one of x#{@@registered_patches.keys.join(', ')}x " unless @@registered_patches.keys.include?(section)
+      raise ArgumentError, "EasyPatchManager->register_patch: The section (#{section}) must be one of x#{@@registered_patches.keys.join(', ')}x " unless @@registered_patches.key?(section)
 
       original_klasses_to_patch.each do |original_klass_to_patch|
         pcollection = @@registered_patches[section].move_and_get_or_insert( original_klass_to_patch, options )
@@ -191,17 +191,13 @@ module RedmineExtensions
         # raise ArgumentError, 'Section order has to be a integer!' unless order.is_a?(Numeric)
         # @name = name
         # @order = order
-        @patches_collections = Array.new
+        @patches_collections = []
         @last_order = 0
       end
 
       def each(&block)
         @patches_collections.each do |patch_collection|
-          if block_given?
-            block.call patch_collection
-          else
-            yield patch_collection
-          end
+          yield patch_collection
         end
       end
 
@@ -335,11 +331,7 @@ module RedmineExtensions
       def each(&block)
 
         @patches.each do |patch|
-          if block_given?
-            block.call patch
-          else
-            yield patch
-          end
+          yield patch
         end
 
       end

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.3.7'
+  VERSION = '0.4.0.beta'
 end

data/spec/features/autocomplete_spec.rb

@@ -3,13 +3,13 @@ RSpec.describe 'autocomplete', type: :feature, js: true, logged: :admin do
   describe 'render' do
     it 'generate default autocomplete' do
       visit '/dummy_autocompletes'
-      expect(page).to have_css('input#default[type="text"]')
+      expect(page).to have_css('input#default[type="search"]')
       expect(page).to have_css('input[type="hidden"][name="default"][value="value1"]', visible: false)
     end
 
     it 'generate autocomplete_field in form_for' do
       visit '/dummy_autocompletes'
-      expect(page).to have_css('input#dummy_entities_autocomplete[type="text"]')
+      expect(page).to have_css('input#dummy_entities_autocomplete[type="search"]')
       expect(page).to have_css('input[type="hidden"][name="dummy_entity[array_of_dummies][]"][value="value1"]', visible: false)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0.beta
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
 description: Redmine Extensions provide many extended functionalities for Redmine
   project.
 email:
@@ -204,14 +204,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Redmine Extensions is set of usefull features for Redmine. Main focus is