redmine_extensions 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c597f9913c0ffc04ec325076ab8ad35091cd3c
-  data.tar.gz: 452764ffbb2580c21cf3fa2b53825f251fd75d64
+  metadata.gz: 971f3ed64d0eff02c0ce05f829e5c9a2761a9a1c
+  data.tar.gz: 367744a4344284fd502ee1c5aaac46d5308ad534
 SHA512:
-  metadata.gz: 208649b38c1944d902bd2385734c1cfbf06270b16827d615ea4832ffaefa552d6c7e05c0e0db396fb3fc6d016be873961fd407a2c62ad8e35021beb14a72f567
-  data.tar.gz: 6ae91032ab6d6edbd54c351cccc6e2db3f0fda795beb63dc58741c0f45a4d4ab01779d2d2de6a5d54726efd005f26deb123b92fa8bbbe2f50dcdcb0480b584b6
+  metadata.gz: 7b5ec3025f3cb6ea81691aedb52b47104846ffaa9c36c6f41d995b0eb358ac95660780851db208d0a158be3b70e6f4a80c52c0c6010febd157eff939f6123f75
+  data.tar.gz: 65ccfbdc8c07b8e82784fe493f5cd4c3bdc0f2ee6c3159d2fac61e9ea64c569d8d9fb44b0af9879dd9cfe992bea905e403f5f136b1bdced7e5a38ca43275070e

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

@@ -584,12 +584,10 @@ window.closeFlashMessage = (function($element){
                 return false;
 
             if( this.options.preload ) {
-                this.load(function(){
-                    if( that.options.multiple ) {
-                        that.valueElement.entityArray('clear');
-                    }
-                    that._setValues(values);
-                });
+                if( that.options.multiple ) {
+                    that.valueElement.entityArray('clear');
+                }
+                that._setValues(values);
             } else {
                 if( that.options.multiple ) {
                     that.valueElement.entityArray('clear');
@@ -609,13 +607,18 @@ window.closeFlashMessage = (function($element){
                 var identifier, label;
                 if( values[i] instanceof Object && !Array.isArray(values[i]) && values[i] !== null ) {
                     selected.push( values[i] );
-                } else if( this.options.preload && Array.isArray(this.possibleValues) )  {
-                    for(var j = this.possibleValues.length - 1; j >= 0; j-- ) {
-                        if ( values[i] == this.possibleValues[j].id || values[i] == this.possibleValues[j].id.toString() ) {
-                            selected.push(this.possibleValues[j]);
-                            break;
+                } else if( this.options.preload )  {
+                    var that = this;
+                    this.load(function(){
+                        if( !Array.isArray(that.possibleValues) )
+                            return;
+                        for(var j = that.possibleValues.length - 1; j >= 0; j-- ) {
+                            if ( values[i] === that.possibleValues[j].id || values[i] === that.possibleValues[j].id.toString() ) {
+                                selected.push(that.possibleValues[j]);
+                                break;
+                            }
                         }
-                    }
+                    });
                 } else {
                     selected.push( {id: values[i], value: values[i]} );
                 }

data/lib/redmine_extensions/easy_query_helpers/outputs.rb

@@ -31,9 +31,13 @@ module RedmineExtensions
       end
 
       def enabled_outputs
-        res = available_output_names.map(&:to_s) if available_output_names.count == 1
-        res ||= @query.outputs
-        res << 'list' if res.empty? && available_outputs.empty?
+        available = available_output_names.map(&:to_s)
+        res = if available.one?
+          available
+        else
+          Array(@query.outputs).map(&:to_s) & available
+        end
+        res << 'list' if res.empty?
         res
       end
 

data/lib/redmine_extensions/patch_manager.rb

@@ -345,7 +345,7 @@ module RedmineExtensions
       end
 
       def apply_patch
-        if (cond = @options.delete(:if)) && cond.respond_to?(:call)
+        if (cond = @options[:if]) && cond.respond_to?(:call)
           return unless cond.call
         end
 

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.1.23'
+  VERSION = '0.1.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails