redmine_extensions 0.0.34 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e0eb376235ff62e381986d30f3a7d8bb6515c1
-  data.tar.gz: a8a898910bd36a58c4f9f66c3a361a57fa74f14e
+  metadata.gz: d3f9a38656f8dd1905443c62f28a474d343a85d1
+  data.tar.gz: 2d754bfeff6d1660ab67d7fced4de34c77d5bc60
 SHA512:
-  metadata.gz: 30a690472d54d8efc1cb8be0963ae8b2796029fc591dcaf85741ac190043d02bf753b55de12a1f333d6d30b0c931b4abd39901336ea038aeaf71354b0ce9ffaa
-  data.tar.gz: 06078d634394143370e1f563d48c8d8e99899df930beee7b0c4eb0f0e589da857cf9b7ddf56c3fc80802c4079f504bd435292e8470fd0c3ac08079afd5ef3310
+  metadata.gz: 9f8a3463a6edc8cfefaf63e9093abe5e354cc2ad32177d74a9a0d340ed1f30be5ffc75964a4331c84d814601b039a77f7f656c2fea18c55c74584431cc2367d3
+  data.tar.gz: ef3ee2923abc88eb42fd8427b8d8ad42ddff8457e954b8adffb817ce942a3d2163c48398004328dff9ad75c0eb8b0ab99b98cd64035dc1af9750c983c873fdbb

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

@@ -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 );
             }
         },
 
@@ -542,6 +544,7 @@ window.closeFlashMessage = (function($element){
                     name: value.value
                 });
                 this.element.trigger('change');
+                this.element.val('');
             } else {
                 this.element.val(value.value);
                 this.valueElement.val(value.id);
@@ -554,42 +557,65 @@ window.closeFlashMessage = (function($element){
             if( typeof values == 'undefined' || !values )
                 return false;
 
+            if( that.options.multiple ) {
+                that.valueElement.entityArray('clear');
+            }
             if( this.options.preload ) {
                 this.load(function(){
-                    if( that.options.multiple ) {
-                        that.valueElement.entityArray('clear');
-                    }
                     that._setValues(values)
                 });
             } else {
-                // TODO - where to get real text value?
-                this.element.val(values[0]);
-                this.valueElement.val(values[0]);
+                that._setValues(values);
             }
         },
 
         _setValues: function(values) {
-            var that = this;
-            $.each(that.possibleValues, function(i, val) {
-                if ( values.indexOf(val.id) > -1 || (values.indexOf(val.id.toString()) > -1)) {
-                    if(that.options.multiple) {
-                        that.valueElement.entityArray('add', { id: val.id, name: val.value });
-                    } else {
-                        that.element.val(val.value);
-                        that.valueElement.val(val.id);
+            var selected = [];
+
+            if( values.length == 0 )
+                return false;
+
+            // allows the combination of only id values and values with label
+            for (var i = values.length - 1; i >= 0; i--) {
+                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 {
+                    selected.push( {id: values[i], value: values[i]} );
                 }
-            });
+            }
+            for (var i = selected.length - 1; i >= 0; i--) {
+                if(this.options.multiple) {
+                    this.valueElement.entityArray('add', { id: selected[i].id, name: selected[i].value });
+                } else {
+                    this.element.val(selected[i].value);
+                    this.valueElement.val(selected[i].id);
+                }
+            }
         },
 
-        getValue: function() {
-            if( this.options.multiple && !this.expanded ) {
-                return this.valueElement.entityArray('getValue'); // entityArray
+        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 {
-                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;
+              });
             }
+            return result;
         }
 
     });

data/{spec/redmine/public/javascripts/redmine_extensions/redmine_extensions.js → app/assets/javascripts/redmine_extensions/redmine_extensions.js.orig}

@@ -542,6 +542,7 @@ window.closeFlashMessage = (function($element){
                     name: value.value
                 });
                 this.element.trigger('change');
+                this.element.val('');
             } else {
                 this.element.val(value.value);
                 this.valueElement.val(value.id);
@@ -554,34 +555,51 @@ window.closeFlashMessage = (function($element){
             if( typeof values == 'undefined' || !values )
                 return false;
 
+            if( that.options.multiple ) {
+                that.valueElement.entityArray('clear');
+            }
             if( this.options.preload ) {
                 this.load(function(){
-                    if( that.options.multiple ) {
-                        that.valueElement.entityArray('clear');
-                    }
                     that._setValues(values)
                 });
             } else {
-                // TODO - where to get real text value?
-                this.element.val(values[0]);
-                this.valueElement.val(values[0]);
+                that._setValues(values);
             }
         },
 
         _setValues: function(values) {
-            var that = this;
-            $.each(that.possibleValues, function(i, val) {
-                if ( values.indexOf(val.id) > -1 || (values.indexOf(val.id.toString()) > -1)) {
-                    if(that.options.multiple) {
-                        that.valueElement.entityArray('add', { id: val.id, name: val.value });
-                    } else {
-                        that.element.val(val.value);
-                        that.valueElement.val(val.id);
+            var selected = [];
+
+            if( values.length == 0 )
+                return false;
+
+            // allows the combination of only id values and values with label
+            for (var i = values.length - 1; i >= 0; i--) {
+                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 {
+                    selected.push( {id: values[i], value: values[i]} );
                 }
-            });
+            }
+            for (var i = selected.length - 1; i >= 0; i--) {
+                if(this.options.multiple) {
+                    this.valueElement.entityArray('add', { id: selected[i].id, name: selected[i].value });
+                } else {
+                    this.element.val(selected[i].value);
+                    this.valueElement.val(selected[i].id);
+                }
+            }
         },
 
+<<<<<<< HEAD
         getValue: function() {
             if( this.options.multiple && !this.expanded ) {
                 return this.valueElement.entityArray('getValue'); // entityArray
@@ -589,6 +607,21 @@ window.closeFlashMessage = (function($element){
                 return this.valueElement.val(); //select multiple=true
             } else {
                 return [this.valueElement.val()]; // hidden field
+=======
+        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
+            } else {
+              result = [this.valueElement.val()]; // hidden field
+            }
+            if( with_label ) {
+              result = this.possibleValues.filter(function(el) {
+                return result.indexOf( el.id ) >= 0;
+              });
+>>>>>>> 4a3284c... labels
             }
         }
 

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})
+      options.reverse_merge!({select_first_value: false, show_toggle_button: false, load_immediately: false, preload: 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: true, 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: 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} });")
       end
     end
 

data/app/helpers/redmine_extensions/application_helper.rb.orig

@@ -6,7 +6,7 @@ module RedmineExtensions
 
     def plugin_settings_path(plugin, *attrs)
       if plugin.is_a?(Redmine::Plugin) && (plugin.settings[:only_easy] || plugin.settings[:easy_settings])
-        redmine_extensions_engine.edit_easy_setting_path(plugin, *attrs)
+        edit_easy_setting_path(plugin, *attrs)
       else
         super
       end
@@ -44,21 +44,20 @@ module RedmineExtensions
       end
     end
 
-    def query_for_entity(entity_class)
-      entity_class_name = entity_class.name
-      query_class = "Easy#{entity_class_name}Query".constantize rescue nil
-      return query_class if query_class && query_class < EasyQuery
-      query_class ||= "#{entity_class_name}Query".constantize rescue nil
-    end
-
-    def render_entity_assignments(entity, target_entity, options = {}, &block)
+    def render_entity_assignments(entity, target_class, options = {}, &block)
       options ||= {}
-      collection_name = options.delete(:collection_name) || target_entity.name.pluralize.underscore
-      query_class = query_for_entity(target_entity)
-
-      return '' if !query_class || !entity.respond_to?(collection_name)
+      collection_name = options.delete(:collection_name) || target_class.name.pluralize.underscore
 
       project = options.delete(:project)
+      query_class = options.delete(:query_class)
+
+      if query_class.nil?
+        query_class_name = target_class.name + 'Query'
+
+        query_class = query_class_name.constantize #if Object.const_defined?(query_class_name)
+      end
+
+      return '' if !query_class || !(query_class < EasyQuery) || !entity.respond_to?(collection_name)
 
       query = query_class.new(:name => 'c_query')
       query.project = project
@@ -69,8 +68,9 @@ module RedmineExtensions
 
       entities_count = entities.size
       options[:entities_count] = entities_count
+
       options[:module_name] ||= "entity_#{entity.class.name.underscore}_#{entity.id}_#{collection_name}"
-      options[:heading] ||= l("label_#{query.entity}_plural", :default => 'Heading')
+      options[:heading] ||= l("label_#{target_class.name.underscore}_plural", :default => 'Heading')
 
       if options[:context_menus_path].nil?
         options[:context_menus_path] = [
@@ -82,11 +82,9 @@ module RedmineExtensions
         end
       end
 
-      query.output = options[:display_style] || (entities_count > 3 ? 'list' : 'tile')
-
       render(:partial => 'easy_entity_assignments/assignments_container', :locals => {
         :entity => entity,
-        :query => query, :project => project,
+        :query => query, :target_class => target_class, :project => project,
         :entities => entities, :entities_count => entities_count, :options => options})
     end
 
@@ -108,104 +106,63 @@ module RedmineExtensions
       end
     end
 
-
-    # ==== Options
-    # * <tt>class: Hash or String</tt> - This option can be used to add custom CSS classes. It can be *String* or *Hash*.
-    #       class: {heading: 'heading-additional-css', container: 'container-additional-css'}
-    # * <tt>heading_tag: name of HTML element of module heading</tt> - By default its its *h3*
-    # ** Aliases for this options are: wrapping_heading_element, header_tag
-    # * <tt>toggle: false</tt> - This disable toggle function (collapsible and remember)
-    # ** Aliases for this options are: collapsible, no_expander
-    # * <tt>remember: false</tt> - This disable remember function of toggle container
-    # ** Aliases for this options are: ajax_call
-    #
-    def render_module_easy_box(id, heading, options = {}, &block) # with fallback to old
-      options[:toggle] = true unless options.key?(:toggle)
-      options[:remember] = options.delete(:ajax_call) if options.key?(:ajax_call)
-      options[:collapsible] = !options.delete(:no_expander) if options.key?(:no_expander)
-
-      renderer = EasyBoxRenderer.new(self, id, heading, options)
-      renderer.content = capture {yield renderer}
-
-      renderer.render
-    end
-
-    EasyBoxRenderer = Struct.new(:view, :id, :heading, :options) do
-
-      attr_writer :container_class, :heading_class, :content_class
-      attr_writer :heading_links, :footer, :icon
-      attr_accessor :content
-
-      def container_class
-        s = (@container_class.presence || css_classes[:container]).to_s
-        s << ' collapsible' if collapsible?
-        s << ' collapsed' if collapsed?
-
-        s
-      end
-
-      def saving_state_enabled?
-        collapsible? && (options[:remember].nil? || !!options[:remember])
-      end
-
-      def heading_tag
-        (options[:wrapping_heading_element] || (options[:header_tag] || options[:heading_tag])).presence || 'h3'
-      end
-
-      def heading_class
-        (@heading_class || css_classes[:heading]).to_s
-      end
-
-      def icon
-        @icon ||= options[:icon] && " icon #{options[:icon]}"
-      end
-
-      def heading_links
-        if block_given?
-          @heading_links = view.capture { yield }
-        else
-          @heading_links.to_s.html_safe
-        end
-      end
-
-      def collapsible?
-        return @collapsible unless @collapsible.nil?
-        @collapsible ||= !!options[:toggle] && (options[:collapsible].nil? || !!options[:collapsible])
+    # options:
+    # => options[:heading] = text beside of plus button
+    # => options[:container_html] = a hash of html attributes
+    # => options[:default_button_state] = (true => expanded -), (false => collapsed +)
+    # => options[:ajax_call] = make ajax call for saving state (true => ajax call, false => no call, no save)
+    # => options[:wrapping_heading_element] = html element outside heading => h3, h4
+    def render_toggler(container_uniq_id, user = nil, options={}, &block)
+      user ||= User.current
+      options[:heading] ||= ''
+      options[:heading_links] ||= []
+      options[:heading_links] = [options[:heading_links]] if options[:heading_links] && !options[:heading_links].is_a?(Array)
+      options[:container_html] ||= {}
+      options[:default_button_state] = false #if is_mobile_device?
+      options[:default_button_state] = true if options[:default_button_state].nil?
+      options[:ajax_call] = true if options[:ajax_call].nil?
+
+      s = ''
+      if !options.key?(:no_heading_button)
+        options[:heading] << content_tag(:div, options[:heading_links].join(' ').html_safe, :class => 'module-heading-links') unless options[:heading_links].blank?
+        s << render_toggler_header(user, options[:heading].html_safe, container_uniq_id, options)
+      end
+
+      if options[:ajax_call] == false
+        expanded = options[:default_button_state]
+      else
+        expanded = true
       end
 
-      def collapsed?
-        !!options[:default] || !!options[:collapsed] || !!options[:default_button_state]
-      end
+      s << (content_tag(:div, {
+        :id => container_uniq_id,
+        :style => (expanded ? '' : 'display:none')
+      }.merge(options[:container_html]) { |k, o, n| "#{o}; #{n}" }, &block))
+      s.html_safe
+    end
 
-      def footer
-        if block_given?
-          @footer = view.capture { yield }
-        else
-          @footer.to_s.html_safe
-        end
-      end
+    def render_toggler_header(user, content, modul_uniq_id, options={})
+      expander_options = options[:expander_options] || {}
+      wrapping_heading_element = options[:wrapping_heading_element] || 'h3'
+      wrapping_heading_element_classes = (options[:wrapping_heading_element_classes] || '') + ' module-heading'
+      wrapping_heading_element_styles = options[:wrapping_heading_element_styles]
+      ajax_call = options.delete(:ajax_call) ? 'true' : 'false'
 
-      def render
-        view.render({partial: 'common/collapsible_module_layout', locals: {renderer: self, content: content}} )
-      end
-      private
+      html = ''
 
-      def css_classes
-        return @css_classes if @css_classes
-        if (css_class = options.delete(:class)).is_a?(Hash)
-          @css_classes = css_class
-        else
-          @css_classes = {
-              container: css_class,
-              heading: css_class,
-              content: css_class
-          }
-        end
+      if options[:no_expander]
+        html << content_tag(wrapping_heading_element, content, :class => wrapping_heading_element_classes, :style => wrapping_heading_element_styles)
+      else
+        html << '<div class="module-toggle-button">'
+        html << "<div class='group open' >"
+        html << content_tag(wrapping_heading_element, content, :class => wrapping_heading_element_classes, :style => wrapping_heading_element_styles, :onclick => "var event = arguments[0] || window.event; if( !$(event.target).hasClass('do_not_toggle') && !$(event.target).parent().hasClass('module-heading-links') ) toggleMyPageModule(this,'#{modul_uniq_id}','#{user.id}', #{ajax_call})")
+        html << "<span class='expander #{expander_options[:class]}' onclick=\"toggleMyPageModule($(this),'#{modul_uniq_id}','#{user.id}', #{ajax_call}); return false;\" id=\"expander_#{modul_uniq_id}\">&nbsp;</span>"
+        html << '</div></div>'
       end
 
+      html.html_safe
     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[:id] ||= sanitize_to_id(name)
@@ -221,10 +178,10 @@ module RedmineExtensions
       content_tag(:span, :class => 'easy-multiselect-tag-container') do
         text_field_tag('', '', (options[:html_options] || {}).merge(id: options[:id])) +
 <<<<<<< HEAD
-          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement]}, 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: true, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: true, 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} });")
->>>>>>> devel
+=======
+          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement]}, 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} });")
+>>>>>>> 4a3284c... labels
       end
     end