redmine_extensions 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f9a38656f8dd1905443c62f28a474d343a85d1
-  data.tar.gz: 2d754bfeff6d1660ab67d7fced4de34c77d5bc60
+  metadata.gz: 1b7e8987102321dff2248fd2573be28b0c578fb4
+  data.tar.gz: 981153016e95e14037fde84cc6e3eff0a6207e0a
 SHA512:
-  metadata.gz: 9f8a3463a6edc8cfefaf63e9093abe5e354cc2ad32177d74a9a0d340ed1f30be5ffc75964a4331c84d814601b039a77f7f656c2fea18c55c74584431cc2367d3
-  data.tar.gz: ef3ee2923abc88eb42fd8427b8d8ad42ddff8457e954b8adffb817ce942a3d2163c48398004328dff9ad75c0eb8b0ab99b98cd64035dc1af9750c983c873fdbb
+  metadata.gz: d1806d41f9c0eeb29ea3a0fe34eb1aa50d2132b472e63f3349301fc9b9d63c66ba098fe299d9516726548468f4b335ffb9672f6dea6a74718246d71723dbfaf3
+  data.tar.gz: d92366f7fc7925c02ccfaf2a922a933cd1b4a8c4b512057febd4ad75e31182859dafdcd6d2c787ea3eb81e3da787659d12ffaf22967f2831cf4db3a0b4da1d14

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

@@ -389,7 +389,7 @@ window.closeFlashMessage = (function($element){
                         select.append(option);
                     });
                     $container = $elem.closest('.easy-multiselect-tag-container');
-                    $container.children(':input').prop('disabled', true);
+                    $container.find(':input').prop('disabled', true);
                     $container.children().hide();
                     $container.append(select);
                     that.valueElement = select;
@@ -554,17 +554,20 @@ window.closeFlashMessage = (function($element){
 
         setValue: function(values) {
             var that = this;
-            if( typeof values == 'undefined' || !values )
+            if( typeof values === 'undefined' || !values )
                 return false;
 
-            if( that.options.multiple ) {
-                that.valueElement.entityArray('clear');
-            }
             if( this.options.preload ) {
                 this.load(function(){
-                    that._setValues(values)
+                    if( that.options.multiple ) {
+                        that.valueElement.entityArray('clear');
+                    }
+                    that._setValues(values);
                 });
             } else {
+                if( that.options.multiple ) {
+                    that.valueElement.entityArray('clear');
+                }
                 that._setValues(values);
             }
         },

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

@@ -340,6 +340,8 @@ window.closeFlashMessage = (function($element){
                 this._initData(this.options.source);
             } else if ( this.options.preload && this.options.load_immediately) {
                 this.load();
+            } else if ( this.selectedValues ) {
+                this.setValue( this.selectedValues );
             }
         },
 
@@ -387,7 +389,7 @@ window.closeFlashMessage = (function($element){
                         select.append(option);
                     });
                     $container = $elem.closest('.easy-multiselect-tag-container');
-                    $container.children(':input').prop('disabled', true);
+                    $container.find(':input').prop('disabled', true);
                     $container.children().hide();
                     $container.append(select);
                     that.valueElement = select;
@@ -494,7 +496,7 @@ window.closeFlashMessage = (function($element){
         },
 
         _initData: function(data) {
-            this.possibleValues = this._formatData(data)
+            this.possibleValues = this._formatData(data);
             this.valuesLoaded = true;
 
             this.selectedValues = this.selectedValues ? this.selectedValues : [];
@@ -552,7 +554,7 @@ window.closeFlashMessage = (function($element){
 
         setValue: function(values) {
             var that = this;
-            if( typeof values == 'undefined' || !values )
+            if( typeof values === 'undefined' || !values )
                 return false;
 
             if( that.options.multiple ) {
@@ -560,9 +562,21 @@ window.closeFlashMessage = (function($element){
             }
             if( this.options.preload ) {
                 this.load(function(){
+<<<<<<< HEAD
                     that._setValues(values)
                 });
             } else {
+=======
+                    if( that.options.multiple ) {
+                        that.valueElement.entityArray('clear');
+                    }
+                    that._setValues(values);
+                });
+            } else {
+                if( that.options.multiple ) {
+                    that.valueElement.entityArray('clear');
+                }
+>>>>>>> stable
                 that._setValues(values);
             }
         },
@@ -599,21 +613,24 @@ window.closeFlashMessage = (function($element){
             }
         },
 
+        getValue: function(with_label) {
+            var result;
+            if ( this.options.multiple && !this.expanded ) {
 <<<<<<< HEAD
-        getValue: function() {
-            if( this.options.multiple && !this.expanded ) {
-                return this.valueElement.entityArray('getValue'); // entityArray
+                result = this.valueElement.entityArray('getValue'); // entityArray
             } else if ( this.options.multiple ) {
-                return this.valueElement.val(); //select multiple=true
+                result = this.valueElement.val(); // select multiple=true
             } else {
-                return [this.valueElement.val()]; // hidden field
+                result = [this.valueElement.val()]; // hidden field
+            }
+            if( with_label ) {
+                result = this.possibleValues.filter(function(el) {
+                    return result.indexOf( el.id ) >= 0;
+                });
 =======
-        getValue: function(with_label) {
-            var result;
-            if ( this.options.multiple && !this.expanded ) {
               result = this.valueElement.entityArray('getValue'); // entityArray
             } else if ( this.options.multiple ) {
-                return this.valueElement.val(); // select multiple=true
+              result = this.valueElement.val(); // select multiple=true
             } else {
               result = [this.valueElement.val()]; // hidden field
             }
@@ -621,8 +638,9 @@ window.closeFlashMessage = (function($element){
               result = this.possibleValues.filter(function(el) {
                 return result.indexOf( el.id ) >= 0;
               });
->>>>>>> 4a3284c... labels
+>>>>>>> stable
             }
+            return result;
         }
 
     });

data/app/controllers/easy_settings_controller.rb

@@ -25,7 +25,7 @@ class EasySettingsController < ApplicationController
     Setting.send "plugin_#{@plugin.id}=", params[:settings] if params[:settings]
     if @easy_settings.save
       flash[:notice] = l(:notice_successful_update)
-      redirect_back_or_default redmine_extensions_engine.edit_easy_setting_path(@easy_settings)
+      redirect_back_or_default edit_easy_setting_path(@easy_settings)
     else
       render :edit
     end

data/app/helpers/redmine_extensions/application_helper.rb

@@ -164,7 +164,7 @@ module RedmineExtensions
     end
 
     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})
+      options.reverse_merge!({select_first_value: false, show_toggle_button: false, load_immediately: false, preload: true, multiple: true})
       options[:id] ||= sanitize_to_id(name)
 
       selected_values ||= []
@@ -177,7 +177,7 @@ module RedmineExtensions
 
       content_tag(:span, :class => 'easy-multiselect-tag-container') do
         text_field_tag('', '', (options[:html_options] || {}).merge(id: options[:id])) +
-          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: #{options[:preload]}, 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} });")
+          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: #{options[:multiple]}, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: #{options[:preload]}, 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} });")
       end
     end
 

data/app/views/easy_entity_assignments/_query_index.html.erb

@@ -1,5 +1,5 @@
 <% if display_style == :list %>
-  <%= render :partial => 'easy_queries/easy_query_entities_list', :locals => {:query => query, :entities => referenced_entities, :options => {:hascontextmenu => true, :disable_sort => true} } -%>
+  <%= render :partial => 'easy_queries/easy_query_entities_list', :locals => {:query => query, :entities => entities, :options => {:hascontextmenu => true, :disable_sort => true} } -%>
 <% elsif display_style == :tile %>
   <div class="easy-entity-cards-container">
     <div class="splitcontent">

data/app/views/easy_entity_assignments/_query_index.html.erb.orig

@@ -0,0 +1,16 @@
+<<<<<<< HEAD
+<% query_outputs(query, entities: referenced_entities, options: { hascontextmenu: true, disable_sort: true }).each do |output| %>
+  <%= output.render_data %>
+=======
+<% if display_style == :list %>
+  <%= render :partial => 'easy_queries/easy_query_entities_list', :locals => {:query => query, :entities => entities, :options => {:hascontextmenu => true, :disable_sort => true} } -%>
+<% elsif display_style == :tile %>
+  <div class="easy-entity-cards-container">
+    <div class="splitcontent">
+      <% entities.each do |referenced_entity| %>
+        <%# render_easy_entity_card(referenced_entity, entity, options.merge(:referenced_entities => referenced_entities)) %>
+      <% end %>
+    </div>
+  </div>
+>>>>>>> stable
+<% end %>

data/app/views/easy_settings/edit.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([redmine_extensions_engine, @easy_settings], html: { class: 'form-box easy-setting-plugin-form' }) do |f| %>
+<%= form_for(@easy_settings, html: { class: 'form-box easy-setting-plugin-form' }) do |f| %>
   <%= hidden_field_tag :back_url, params[:back_url] %>
 
   <%= render "easy_settings/#{@easy_settings.plugin.id}", easy_settings: @easy_settings, settings: @settings, form: f %>

data/config/routes.rb

@@ -1,7 +1,11 @@
+# Engine routes
 RedmineExtensions::Engine.routes.draw do
-
   resources :easy_settings, except: :destroy
-
 end
 
-RedmineExtensions::Engine.automount!
+# Redmine routes
+Rails.application.routes.draw do
+  mount RedmineExtensions::Engine => '/redmine_extensions'
+
+  resources :easy_settings, except: :destroy
+end

data/lib/redmine_extensions/engine.rb

@@ -4,15 +4,6 @@ require 'redmine_extensions/redmine_patches/patches'
 module RedmineExtensions
   class Engine < ::Rails::Engine
 
-    def self.automount!(path = nil)
-      engine = self
-      path ||= engine.to_s.underscore.split('/').first
-      Rails.application.routes.draw do
-        mount engine => path
-        resources :easy_settings, only: [:edit]
-      end
-    end
-
     config.generators do |g|
       g.test_framework      :rspec,        :fixture => false
       g.fixture_replacement :factory_girl, :dir => 'spec/factories'

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 end

data/lib/redmine_extensions/version.rb.orig

@@ -0,0 +1,7 @@
+module RedmineExtensions
+<<<<<<< HEAD
+  VERSION = '0.1.09'
+=======
+  VERSION = '0.0.36'
+>>>>>>> stable
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,6 +119,7 @@ files:
 - app/presenters/redmine_extensions/easy_setting_presenter.rb
 - app/views/easy_entity_assignments/_assignments_container.html.erb
 - app/views/easy_entity_assignments/_query_index.html.erb
+- app/views/easy_entity_assignments/_query_index.html.erb.orig
 - app/views/easy_queries/_entities.html.erb
 - app/views/easy_queries/_index.html.erb
 - app/views/easy_queries/_settings.html.erb
@@ -193,6 +194,7 @@ files:
 - lib/redmine_extensions/redmine_patches/controllers/issues_controller_patch.rb
 - lib/redmine_extensions/redmine_patches/patches.rb
 - lib/redmine_extensions/version.rb
+- lib/redmine_extensions/version.rb.orig
 - lib/tasks/redmine_extensions_tasks.rake
 - spec/factories/easy_queries.rb
 - spec/factories/easy_settings.rb