redmine_extensions 0.3.9 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f369cad50b5819cd1b64a88ad2adc53a3dd552e8ac78beb3ccce856a65827b1
-  data.tar.gz: 2f8dada56e18d3229d579d15be0847562dae66d8e6192739763e55ee1c690283
+  metadata.gz: a5473a3520201d93aaa40645dfdc8bd03536e93286e8d7a5bccc08cf0fbc8006
+  data.tar.gz: cd979b19e9ea1e35a274d45ba6f2fa09ade3f15cf1e31d2743ac210249e4a873
 SHA512:
-  metadata.gz: 7a7b975c8acbb6c57fc571f3b1b552545f044390970e9eeec5982f66210db6a20df47483590d4039f8905c7aa27519318e2910455461a3660f2f7645ff9b7617
-  data.tar.gz: bd955f35431f20e00d84ee9f4712fe62250c6a1662d084cac37a29fa008b795757620fe06a71dc7833c781e776fe6066388a7e6158cd5f96187c60ffcb4cfb43
+  metadata.gz: 9aa3d665971ad245e8f415bab96c438341309d7c3cd4a14c1a0a81e52c13bd5b9581d66983b8efa9d7a071201ca2945611350d83a322eb80fb36fbe082ac800b
+  data.tar.gz: 970f4328576c02b5193d61fd661ffe6ad21a01c54f07a539e8fde5e762a25ee8e6d98e1843019dea18769672fe353051aa42699e53df17639960b8aced0b0251

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

@@ -1,3 +1,5 @@
 window.EASY = window.EASY || {};
 window.EasyGem = window.EasyGem || {};
-window.EasyGem.test = window.EasyGem.test || {};
+window.EasyGem.test = window.EasyGem.test || {};
+window.EASY.asyncModules = window.EASY.asyncModules || {};
+window.EASY.asyncModules.states = window.EASY.asyncModules.states || {};

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
@@ -123,6 +123,22 @@ module RedmineExtensions
       content_tag(:script, javascript_cdata_section(content), html_options)
     end
 
+    def require_javascript_tag(content_or_options_with_block = nil, html_options = {}, &block)
+      content =
+        if block_given?
+          html_options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
+          capture(&block)
+        else
+          content_or_options_with_block
+        end
+      html_options.reverse_merge!(type: 'application/javascript')
+      html_options[:data] ||= { container: '' }
+      html_options[:data][:container].slice!("#module_inside_")
+      content = "EasyGem.schedule.require(function(){#{content}}, function(){ return EASY.asyncModules.states['#{html_options[:data][:container]}']});"
+
+      javascript_tag content.html_safe, html_options
+    end
+
     def get_jasmine_tags
       tags = params[:jasmine]
       return [] if tags == 'true'
@@ -183,8 +199,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 +280,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 +287,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 ||= []
@@ -285,7 +300,7 @@ module RedmineExtensions
 
       content_tag(:span, :class => 'easy-multiselect-tag-container') do
         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}, 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} });")
+          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 +312,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/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/key.rb

@@ -21,7 +21,7 @@ module EasySettings
           Key
         end
 
-      key_class.new(name, options)
+      key_class.new(name, **options)
     end
 
     def initialize(name, **options)

data/lib/redmine_extensions/easy_settings/mapper.rb

@@ -10,20 +10,20 @@ 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)
       end
 
       EasySetting.mapper_clear_caches
-      @all_keys[name] = EasySettings::Key.init(name, options)
+      @all_keys[name] = EasySettings::Key.init(name, **options)
     end
     alias_method :add_key, :key
 
     def keys(*names, **options, &block)
       names.each do |name|
-        key(name, options, &block)
+        key(name, **options, &block)
       end
     end
     alias_method :add_keys, :keys

data/lib/redmine_extensions/engine.rb

@@ -63,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.9'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.1
 platform: ruby
 authors:
 - Easy Software Ltd
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2021-03-03 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.1'
+        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.1'
+        version: '6.2'
 description: Redmine Extensions provide many extended functionalities for Redmine
   project.
 email:
@@ -196,7 +196,7 @@ homepage: https://www.easyredmine.com
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,15 +204,15 @@ 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'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Redmine Extensions is set of usefull features for Redmine. Main focus is
   on development helpers, but many users can find it helpfull