redmine_extensions 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2133af14695fcd1b2b6da12d56b498ad5cf1f841
-  data.tar.gz: 40172f75a841b4f78f6f3888ed482673bae13bd2
+  metadata.gz: 1b1aa0e104dd814d76200dc13913de85ee164c63
+  data.tar.gz: 69323429240bced2bbe3073800e38da7d8677209
 SHA512:
-  metadata.gz: e36b040029f25a9cdfc4b22e15cb9c8f26dd03febe8f153efe2a6421d8d8d5b1bbdf295c55c8ff39145cb78c1ac4273e0dff443201af0723779382aa19fee3f6
-  data.tar.gz: 3f2bd65fd7239d67859f068eff2b52af75233be4c4a4a0241b47cf49646c3c49baa52289bc94529cf15921690e4c5edf092e833955c8685ee33c5c207cc2c8b8
+  metadata.gz: 06f43d7bbd756a988f48003df31d67c416cec480bfe1ea5e97fcf8f8e018bb67b2960618087fc21582de340e40158c222bcc5802b93c592fbce05365b546f269
+  data.tar.gz: bb7111418801f304c9a8d163101558ac37d02684b736b6aa0406a85c1ab2e975b1a1df4b7a7abaa83d09bad163253290ad398b1b38ad9852f682fa195a6a6bfe

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

@@ -0,0 +1,130 @@
+;(function ($, window, document, undefined) {
+    "use strict";
+
+    var pluginName = "entityArray",
+        defaults = {
+            propertyName: "value"
+        };
+
+    function Plugin (element, options) {
+        this.element = element;
+        this.options = $.extend({}, defaults, options);
+        this._defaults = defaults;
+        this._name = pluginName;
+        this.init();
+    }
+
+    Plugin.prototype = {
+
+        init: function () {
+            var self = this;
+            this.entities = {};
+            this.element.addClass("entity-array");
+            this.createEmptyInput();
+
+            if (this.options.entities) {
+                $.each(this.options.entities, function () {
+                    self.add(this);
+                });
+            }
+        },
+
+        add: function (entity) {
+            var self = this;
+
+            this.normalizeEntityData(entity);
+            if (!entity.id || entity === "" || this.entities[entity.id]) {
+                return null;
+            }
+
+            entity.element = $("<span/>")
+                .html(entity.name)
+                .addClass(entity.className || this.options.className)
+                .appendTo(this.element)
+                .after(" ");
+
+            $("<input/>")
+                .attr("type", "hidden")
+                .attr("name", this.options.inputNames)
+                .val(entity.id)
+                .appendTo(entity.element);
+
+            $("<span/>")
+                .html('&nbsp;')
+                .addClass("icon icon-del")
+                .appendTo(entity.element)
+                .data("entity-id", entity.id)
+                .click(function () {
+                    self.removeEntity($(this).data("entity-id"));
+                });
+
+            this.entities[entity.id] = entity;
+
+            this.removeEmptyInput();
+
+            return entity;
+        },
+
+        removeEntity: function (entityId) {
+            var entity = this.entities[entityId];
+            entity.element.remove();
+
+            delete this.entities[entityId];
+
+            if (Object.keys(this.entities).length === 0) {
+                this.createEmptyInput();
+            }
+
+            if (typeof this.options.afterRemove === "function") {
+                this.options.afterRemove(entity);
+            }
+        },
+
+        clear: function () {
+            for( var id in this.entities ) {
+                this.removeEntity(id);
+            }
+        },
+
+        getValue: function() {
+            return Object.keys(this.entities);
+        },
+
+        normalizeEntityData: function (entityData) {
+            entityData.id = entityData.id.toString();
+            entityData.name = entityData.name.toString();
+        },
+
+        createEmptyInput: function () {
+            this.emptyInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("name", this.options.inputNames)
+                .appendTo(this.element);
+        },
+
+        removeEmptyInput: function () {
+            if (this.emptyInput) {
+                this.emptyInput.remove();
+                this.emptyInput = null;
+            }
+        }
+
+    };
+
+    $.fn[pluginName] = function (options, methodAttrs) {
+        var value = null;
+        this.each(function () {
+            var instance = $.data(this, "plugin_" + pluginName);
+            if (!instance) {
+                $.data(this, "plugin_" + pluginName, new Plugin($(this), options));
+            } else  {
+                value = instance[options].call(instance, methodAttrs);
+            }
+        });
+        if( value !== null )
+            return value;
+        else
+            return this;
+    };
+
+})(jQuery, window, document);

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

@@ -297,3 +297,290 @@ window.showFlashMessage = (function(type, message, delay){
 window.closeFlashMessage = (function($element){
     $element.closest('.flash').fadeOut(500, function(){$element.remove();});
 });
+
+
+(function($, undefined) {
+
+    $.widget('easy.easymultiselect', {
+        options: {
+            source: null,
+            selected: null,
+            multiple: true, // multiple values can be selected
+            preload: true, // load all possible values
+            position: {collision: 'flip'},
+            autofocus: false,
+            inputName: null, // defaults to element prop name
+            render_item: function(ul, item) {
+                return $("<li>")
+                    .data("item.autocomplete", item)
+                    .append(item.label)
+                    .appendTo(ul);
+            },
+            activate_on_input_click: true,
+            load_immediately: false,
+            show_toggle_button: true,
+            select_first_value: true,
+            autocomplete_options: {}
+        },
+
+        _create: function() {
+            this.selectedValues = this.options.selected;
+            this._createUI();
+            this.expanded = false;
+            this.valuesLoaded = false;
+            this.afterLoaded = [];
+            if ( Array.isArray(this.options.source) ) {
+                this.options.preload = true;
+                this._initData(this.options.source);
+            } else if ( this.options.preload && this.options.load_immediately) {
+                this.load();
+            }
+        },
+
+        _createUI: function() {
+            var that = this;
+            this.element.wrap('<span class="easy-autocomplete-tag"></span>');
+            this.tag = this.element.parent();
+            this.inputName = this.options.inputName || this.element.prop('name');
+
+            if( this.options.multiple ) { // multiple values
+                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) {
+                        that.element.trigger('change');
+                    }
+                });
+            } else { //single value
+                this.valueElement = $('<input>', {type: 'hidden', name: this.inputName});
+                this.element.after(this.valueElement);
+            }
+
+            this._createAutocomplete();
+            if( !this.options.multiple ) {
+                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(){
+                    select = $('<select>').prop('multiple', true).prop('size', 5).prop('name', that.inputName);
+                    $.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);
+                    });
+                    $container = $elem.closest('.easy-multiselect-tag-container')
+                    $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);
+        },
+
+        _createAutocomplete: function() {
+            var that = this;
+
+            that.element.autocomplete($.extend({
+                source: function(request, response) {
+                    if( that.options.preload ) {
+                        that.load(function(){
+                            var matcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
+                            response($.grep(that.possibleValues, function(val, i) {
+                                return ( !that.options.multiple || !request.term || matcher.test(val.value));
+                            }));
+                        }, function(){
+                            response();
+                        });
+                    } else { // asking server everytime
+                        $.getJSON(that.options.source, {
+                            term: request.term
+                        }, function(json) {
+                            response(that.options.rootElement ? json[that.options.rootElement] : json);
+                        });
+                    }
+                },
+                minLength: 0,
+                select: function(event, ui) {
+                    that.selectValue(ui.item)
+                    return false;
+                },
+                change: function(event, ui) {
+                    if (!ui.item) {
+                        $(this).val('');
+                        if( !that.options.multiple ) {
+                            that.valueElement.val('');
+                            that.valueElement.change();
+                        }
+                    }
+                },
+                position: this.options.position,
+                autoFocus: this.options.autofocus
+            }, this.options.autocomplete_options)).data("ui-autocomplete")._renderItem = this.options.render_item;
+
+            this.element.click(function() {
+                $(this).select();
+            });
+            if( this.options.activate_on_input_click ) {
+                this.element.on('click', function() {
+                    if(!that.options.preload)
+                        that.element.focus().val('');
+                    that.element.trigger('keydown');
+                    that.element.autocomplete("search", that.element.val());
+                });
+            }
+
+            $("<button type='button'>&nbsp;</button>")
+                .attr("tabIndex", -1)
+                .insertAfter(that.element)
+                .button({
+                    icons: {
+                        primary: "ui-icon-triangle-1-s"
+                    },
+                    text: false
+                })
+                .removeClass("ui-corner-all")
+                .addClass("ui-corner-right ui-button-icon")
+                .css('font-size', '10px')
+                .css('margin-left', -1)
+                .click(function() {
+                    if (that.element.autocomplete("widget").is(":visible")) {
+                        that.element.autocomplete("close");
+                        that.element.blur();
+                        return;
+                    }
+                    $(this).blur();
+                    if(!that.options.preload)
+                        that.element.focus().val('');
+                    that.element.trigger('keydown');
+                    that.element.autocomplete("search", that.element.val());
+                });
+        },
+
+        _formatData: function(data) {
+            return $.map(data, function(elem, i){
+                var id, value;
+                if( $.isArray(elem) ) {
+                    value = elem[0];
+                    id = elem[1];
+                } else {
+                    id = value = elem;
+                }
+                return {value: value, id: id};
+            });
+        },
+
+        _initData: function(data) {
+            this.possibleValues = this._formatData(data)
+            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 ) {
+                this.selectedValues.push(this.possibleValues[0]['id'])
+            }
+
+            this.setValue(this.selectedValues);
+        },
+
+        load: function(success, fail) {
+            var that = this;
+            if( this.valuesLoaded ) {
+                if( typeof success === 'function' )
+                    success();
+                return;
+            }
+
+            if( typeof success === 'function' )
+                this.afterLoaded.push(success);
+
+            if( this.loading )
+                return;
+
+            this.loading = true;
+            $.ajax(this.options.source, {
+                dataType: 'json',
+                success: function(data, status, xhr) {
+                    that._initData(data);
+                    for (var i = that.afterLoaded.length - 1; i >= 0; i--) {
+                        that.afterLoaded[i].call();
+                    }
+                },
+                error: fail
+            }).always(function(){
+                that.loading = false;
+            });
+        },
+
+        selectValue: function(value) {
+            if( this.options.multiple ) {
+                this.valueElement.entityArray('add', {
+                    id: value.id,
+                    name: value.value
+                });
+                this.element.trigger('change');
+            } else {
+                this.element.val(value.value);
+                this.valueElement.val(value.id);
+                this.valueElement.change();
+            }
+        },
+
+        setValue: function(values) {
+            var that = this;
+            if( typeof values == 'undefined' || !values )
+                return false;
+
+            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]);
+            }
+        },
+
+        _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);
+                    }
+                }
+            });
+        },
+
+        getValue: function() {
+            if( this.options.multiple && !this.expanded ) {
+                return this.valueElement.entityArray('getValue'); // entityArray
+            } else if ( this.options.multiple ) {
+                return this.valueElement.val(); //select multiple=true
+            } else {
+                return [this.valueElement.val()]; // hidden field
+            }
+        }
+
+    });
+
+})(jQuery);

data/app/helpers/redmine_extensions/application_helper.rb

@@ -44,6 +44,142 @@ module RedmineExtensions
       end
     end
 
+    def render_entity_assignments(entity, target_class, options = {}, &block)
+      options ||= {}
+      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
+      query.set_entity_scope(entity, collection_name)
+      query.column_names = options[:query_column_names] unless options[:query_column_names].blank?
+
+      entities = query.entities
+
+      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_#{target_class.name.underscore}_plural", :default => 'Heading')
+
+      if options[:context_menus_path].nil?
+        options[:context_menus_path] = [
+          "context_menu_#{collection_name}_path".to_sym,
+          "context_menus_#{collection_name}_path".to_sym,
+          "#{collection_name}_context_menu_path".to_sym
+        ].detect do |m|
+          m if respond_to?(m)
+        end
+      end
+
+      render(:partial => 'easy_entity_assignments/assignments_container', :locals => {
+        :entity => entity,
+        :query => query, :target_class => target_class, :project => project,
+        :entities => entities, :entities_count => entities_count, :options => options})
+    end
+
+    def entity_css_icon(entity_or_entity_class)
+      return '' if entity_or_entity_class.nil?
+
+      if entity_or_entity_class.is_a?(Class) && entity_or_entity_class.respond_to?(:css_icon)
+        entity_or_entity_class.css_icon
+      elsif entity_or_entity_class.is_a?(ActiveRecord::Base)
+        if entity_or_entity_class.respond_to?(:css_icon)
+          entity_or_entity_class.css_icon
+        elsif entity_or_entity_class.class.respond_to?(:css_icon)
+          entity_or_entity_class.class.css_icon
+        else
+          "icon icon-#{entity_or_entity_class.class.name.dasherize}"
+        end
+      else
+        "icon icon-#{entity_or_entity_class.class.name.dasherize}"
+      end
+    end
+
+    # 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
+
+      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 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'
+
+      html = ''
+
+      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})
+      options[:id] ||= sanitize_to_id(name)
+
+      selected_values ||= []
+
+      if jsonpath_or_array.is_a?(Array)
+        source = jsonpath_or_array.to_json
+      else
+        source = "'#{jsonpath_or_array}'"
+      end
+
+      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, 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} });")
+      end
+    end
 
   end
 end

data/app/models/easy_entity_assignment.rb

@@ -0,0 +1,6 @@
+class EasyEntityAssignment < ActiveRecord::Base
+
+  belongs_to :entity_from, :polymorphic => true
+  belongs_to :entity_to, :polymorphic => true
+
+end

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

@@ -0,0 +1,30 @@
+<%
+   display_style = options[:display_style] || (entities_count > 3 ? :list : :tile)
+   heading = "#{options[:heading]} (#{entities_count})"
+%>
+<% if entities_count > 0 %>
+  <div id="<%= options[:module_name] %>_container" class="entity_references_container easy-dropper-target easy-drop-issue <%= display_style.to_s %>" data-drop-action="<%= entity.class.name.underscore %>" data-entity-id="<%= entity.id %>" data-issue-show="1">
+    <%= call_hook(:view_easy_entity_assignemnt_top, :entity => entity, :query => query, :entities => entities, :options => options, :target_class => target_class) %>
+    <div class="box">
+      <%# entity_cards_params = {:module_name => options[:module_name], :project_id => project, :source_entity_type => entity.class.name, :source_entity_id => entity, :referenced_entity_type => referenced_entity_type, :referenced_collection_name => options[:referenced_collection_name]}.merge!(query.to_params) %>
+      <% entity_cards_params = {} %>
+      <%= render_toggler(options[:module_name], User.current, {:heading => heading + ':', :wrapping_heading_element_classes => entity_css_icon(target_class),
+                                                                   :container_html => {:class => 'module-inside'}, :default_button_state => false, :heading_links => [
+                                                      link_to('', {}, :class => 'icon-slab', :remote => true, :data => {:display => 'slab'}, :title => l(:title_easy_card_display_changer_tile)),
+                                                      link_to('', {}, :class => 'icon-bullet-list', :remote => true, :data => {:display => 'list'}, :title => l(:title_easy_card_display_changer_list))
+                                                    ]}) do %>
+
+
+          <%= render(:partial => 'easy_entity_assignments/query_index', :locals => {
+                                                                      :entity => entity,
+                                                                      :query => query, :target_class => target_class,
+                                                                      :project => project, :options => options, :entities => entities, :display_style => display_style}) %>
+
+
+        <% if options[:context_menus_path] && respond_to?(options[:context_menus_path]) %>
+          <%# context_menu(send(options[:context_menus_path], {:project_id => project, :back_url => url_for(params)}), "##{options[:module_name]}_container") -%>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,11 @@
+<% if display_style == :list %>
+  <%= render :partial => 'easy_queries/easy_query_entities_list', :locals => {:query => query, :entities => referenced_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>
+<% end %>

data/app/views/easy_queries/_index.html.erb

@@ -7,4 +7,4 @@
 <%= render 'easy_queries/settings', query: query %>
 <%= render 'easy_queries/entities', query: query, entities: entities %>
 
-<%= context_menu issues_context_menu_path %>
+<%# context_menu issues_context_menu_path %>

data/db/migrate/20160519161300_create_entity_assignments.rb

@@ -0,0 +1,19 @@
+class CreateEntityAssignments < ActiveRecord::Migration
+  def self.up
+    unless table_exists?(:easy_entity_assignments)
+      create_table :easy_entity_assignments do |t|
+        t.references :entity_from, :polymorphic => true
+        t.references :entity_to, :polymorphic => true
+        t.timestamps
+      end
+
+      add_index :easy_entity_assignments, [:entity_from_type, :entity_from_id, :entity_to_type, :entity_to_id], :name => 'entity_assignment_idx', :unique => true
+      add_index :easy_entity_assignments, :entity_from_id, :name => 'entity_assignment_idx_from'
+      add_index :easy_entity_assignments, :entity_to_id, :name => 'entity_assignment_idx_to'
+    end
+  end
+
+  def self.down
+    drop_table :easy_entity_assignments
+  end
+end

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

@@ -48,7 +48,11 @@ module RedmineExtensions
 
       if File.exists?("#{plugin_path}/config/locales/en.yml")
         append_to_file "#{plugin_path}/config/locales/en.yml" do
-          "\n  easy_query:" +
+          "\n  activerecord:" +
+            "\n  easy_query:" +
+            "\n    attributes:" +
+            "\n      #{model_name_underscored}:" +
+            db_columns.collect { |column_name, column_options| "\n        #{column_options[:lang_key]}: #{column_name.humanize}" }.join +
             "\n    name:" +
             "\n      #{model_name_underscored}_query: #{model_name_pluralize_underscored.titleize}" +
             "\n  heading_#{model_name_underscored}_new: New #{model_name_underscored.titleize}" +
@@ -60,9 +64,6 @@ module RedmineExtensions
             "\n  permission_manage_#{model_name_pluralize_underscored}: Manage #{model_name_pluralize_underscored.titleize}" +
             "\n  title_#{model_name_underscored}_new: Click to create new #{model_name_underscored.titleize}"
         end
-        append_to_file "#{plugin_path}/config/locales/en.yml" do
-          db_columns.collect { |column_name, column_options| "\n  #{column_options[:lang_key]}: #{column_name.humanize}" }.join
-        end
       else
         template 'en.yml.erb', "#{plugin_path}/config/locales/en.yml"
       end
@@ -96,6 +97,7 @@ module RedmineExtensions
         append_to_file "#{plugin_path}/config/routes.rb" do
           "\nresources :#{model_name_pluralize_underscored} do" +
             "\n  collection do " +
+            "\n    get 'autocomplete'" +
             "\n    get 'bulk_edit'" +
             "\n    post 'bulk_update'" +
             "\n    get 'context_menu'" +
@@ -111,8 +113,8 @@ module RedmineExtensions
         s << "\n  require '#{plugin_name_underscored}/#{model_name_underscored}_hooks'\n"
         s << "\n  Redmine::AccessControl.map do |map|"
         s << "\n    map.project_module :#{model_name_pluralize_underscored} do |pmap|"
-        s << "\n      pmap.permission :view_#{model_name_pluralize_underscored}, { #{model_name_pluralize_underscored}: [:index, :show] }, read: true"
-        s << "\n      pmap.permission :manage_#{model_name_pluralize_underscored}, { #{model_name_pluralize_underscored}: [:new, :create, :edit, :update, :destroy, :bulk_edit, :bulk_update, :context_menu] }"
+        s << "\n      pmap.permission :view_#{model_name_pluralize_underscored}, { #{model_name_pluralize_underscored}: [:index, :show, :autocomplete, :context_menu] }, read: true"
+        s << "\n      pmap.permission :manage_#{model_name_pluralize_underscored}, { #{model_name_pluralize_underscored}: [:new, :create, :edit, :update, :destroy, :bulk_edit, :bulk_update] }"
         s << "\n    end "
         s << "\n  end\n"
         s << "\n  Redmine::MenuManager.map :top_menu do |menu|"
@@ -201,7 +203,8 @@ module RedmineExtensions
 
       attributes.each do |attr|
         attr_name, attr_type, attr_idx = attr.split(':')
-        lang_key = "field_#{model_name_underscored}_#{attr_name.to_s.sub(/_id$/, '').sub(/^.+\./, '')}"
+        #lang_key = "field_#{model_name_underscored}_#{attr_name.to_s.sub(/_id$/, '').sub(/^.+\./, '')}"
+        lang_key = "#{attr_name.to_s.sub(/_id$/, '').sub(/^.+\./, '')}"
 
         @db_columns[attr_name] = {type: attr_type || 'string', idx: attr_idx, null: true, safe: true, query_type: attr_type || 'string', lang_key: lang_key}
       end

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

@@ -2,7 +2,7 @@
   <%- if project? -%>
   <%% if <%= model_name_underscored %>.safe_attribute?('project_id') && !@project %>
   <p>
-    <%%= f.label :project_id, <%= model_name %>.human_attribute_name(:project_id) %>
+    <%%= 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 %>
@@ -10,7 +10,7 @@
   <%- 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 %>) %>
+    <%%= 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' -%>

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

@@ -3,7 +3,7 @@
   <li><%%= link_to l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit' %></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' %></li>
+  <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 %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder' %></li>
+  <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>

data/lib/generators/redmine_extensions/entity/templates/controller.rb.erb

@@ -128,6 +128,9 @@ class <%= controller_class %>Controller < ApplicationController
     render :layout => false
   end
 
+  def autocomplete
+  end
+
   private
 
   def find_<%= model_name_underscored %>

data/lib/generators/redmine_extensions/entity/templates/en.yml.erb

@@ -1,4 +1,8 @@
 en:
+  activerecord:
+    attributes:
+      <%= model_name_underscored %>:
+<%= db_columns.collect{|column_name, column_options| "\n        #{column_options[:lang_key]}: #{column_name.humanize}"  }.join %>
   easy_query:
     name:
       <%= model_name_underscored %>_query: <%= model_name_pluralize_underscored.titleize %>
@@ -10,4 +14,3 @@ en:
   permission_view_<%= model_name_pluralize_underscored %>: View <%= model_name_pluralize_underscored.titleize %>
   permission_manage_<%= model_name_pluralize_underscored %>: Manage <%= model_name_pluralize_underscored.titleize %>
   title_<%= model_name_underscored %>_new: Click to create new <%= model_name_underscored.titleize %>
-<%= db_columns.collect{|column_name, column_options| "\n  #{column_options[:lang_key]}: #{column_name.humanize}"  }.join %>

data/lib/generators/redmine_extensions/entity/templates/model.rb.erb

@@ -53,6 +53,10 @@ class <%= model_name %> < ActiveRecord::Base
   after_update :send_update_notification
   <%- end -%>
 
+  def self.human_attribute_name(attribute, *args)
+    l(attribute.to_s.gsub(/\_id$/, ''), :scope => [:activerecord, :attributes, :<%= model_name_underscored %>])
+  end
+
   def self.visible_condition(user, options={})
   <%- if project? -%>
     Project.allowed_to_condition(user, :<%= view_permission %>, options)

data/lib/generators/redmine_extensions/entity/templates/query.rb.erb

@@ -6,10 +6,10 @@ class <%= model_name %>Query < EasyQuery
     <%- db_columns.each do |column_name, column_options| -%>
     <%- if project? && column_name == 'project_id' -%>
     if project.nil?
-      add_available_filter '<%= column_name %>', name: <%= model_name %>.human_attribute_name(:<%= column_name %>), type: :<%= column_options[:query_type] %>, values: all_projects_values
+      add_available_filter '<%= column_name %>', name: ::<%= model_name %>.human_attribute_name(:<%= column_name %>), type: :<%= column_options[:query_type] %>, values: all_projects_values
     end
     <%- else -%>
-    add_available_filter '<%= column_name %>', name: <%= model_name %>.human_attribute_name(:<%= column_name %>), type: :<%= column_options[:query_type] -%>
+    add_available_filter '<%= column_name %>', name: ::<%= model_name %>.human_attribute_name(:<%= column_name %>), type: :<%= column_options[:query_type] -%>
     <%- end -%>
     <%- end -%>
     <%- if acts_as_customizable? -%>
@@ -21,7 +21,7 @@ class <%= model_name %>Query < EasyQuery
     return @available_columns if @available_columns
 
     <%- db_columns.each do |column_name, column_options| -%>
-    add_available_column '<%= column_options[:query_column_name] || column_name %>', title: <%= model_name %>.human_attribute_name(:<%= column_name %>)
+    add_available_column '<%= column_options[:query_column_name] || column_name %>', caption: ::<%= model_name %>.human_attribute_name(:<%= column_name %>)
       <%- end -%>
     <%- if acts_as_customizable? -%>
     @available_columns += <%= model_name %>CustomField.visible.collect {|cf| QueryCustomFieldColumn.new(cf) }

data/lib/generators/redmine_extensions/entity/templates/routes.rb.erb

@@ -5,6 +5,7 @@ end
 <% end %>
 resources :<%= model_name_pluralize_underscored %> do
   collection do
+    get 'autocomplete'
     get 'bulk_edit'
     post 'bulk_update'
     get 'context_menu'

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

@@ -5,9 +5,9 @@
 <%- safe_columns.each_with_index do |column, idx| -%>
 <%- next if description_column? && column[0] == description_column -%>
 <%- if idx % 2 == 0 -%>
-      <%% rows.left <%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
+      <%% rows.left ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
 <%- else -%>
-      <%% rows.right <%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
+      <%% rows.right ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
 <%- end -%>
 <%- end -%>
     <%% end %>
@@ -18,7 +18,7 @@
   <%% if !@<%= model_name_underscored %>.<%= description_column %>.blank? %>
     <hr />
     <div class="description">
-      <p><strong><%%= <%= model_name %>.human_attribute_name(:<%= description_column %>) %></strong></p>
+      <p><strong><%%= ::<%= model_name %>.human_attribute_name(:<%= description_column %>) %></strong></p>
       <div class="wiki">
         <%%= textilizable @<%= model_name_underscored %>, :<%= description_column %>, attachments: @<%= model_name_underscored %>.attachments %>
       </div>

data/lib/generators/redmine_extensions/plugin/templates/Gemfile.erb

@@ -1 +1 @@
-gem 'redmine_extensions', '~> 0.0.21'
+gem 'redmine_extensions' unless Dir.exist?(File.expand_path('../../easyproject', __FILE__))

data/lib/redmine_extensions/easy_query_adapter.rb

@@ -63,8 +63,12 @@ class EasyQueryAdapter < Query
     @formatter = formatter_klass.new(object)
   end
 
+  def entity
+    self.class.queried_class
+  end
+
   def entity_scope
-    if @entity_scope.present?
+    if !@entity_scope.nil?
       @entity_scope
     elsif entity.respond_to?(:visible)
       entity.visible
@@ -73,6 +77,16 @@ class EasyQueryAdapter < Query
     end
   end
 
+  def set_entity_scope(entity, reference_collection = nil)
+    return nil if entity.nil? || reference_collection.nil?
+
+    @entity_scope = entity.send(reference_collection.to_sym)
+
+    self.filters = {}
+
+    @entity_scope
+  end
+
   def create_entity_scope(options={})
     scope = entity_scope.where(statement)
 
@@ -111,7 +125,7 @@ class EasyQueryAdapter < Query
   end
 
   def entities(options={})
-    create_entity_scope(options).order(options[:order])
+    create_entity_scope(options).order(options[:order]).to_a
   end
 
   def add_available_column(name, options={})

data/lib/redmine_extensions/hooks.rb

@@ -2,6 +2,7 @@ module RedmineExtensions
   class Hooks < Redmine::Hook::ViewListener
 
     def view_layouts_base_html_head(context={})
+      javascript_include_tag('redmine_extensions/jquery.entityarray') +
       javascript_include_tag('redmine_extensions/redmine_extensions')
     end
 

data/lib/redmine_extensions/redmine_patches/controllers/application_controller_patch.rb

@@ -52,5 +52,4 @@ module RedmineExtensions
 
   end
 end
-
 RedmineExtensions::PatchManager.register_controller_patch 'ApplicationController', 'RedmineExtensions::ApplicationControllerPatch'

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.0.28'
+  VERSION = '0.0.29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,14 +105,18 @@ files:
 - LICENSE
 - Rakefile
 - app/assets/javascripts/redmine_extensions/application.js
+- app/assets/javascripts/redmine_extensions/jquery.entityarray.js
 - app/assets/javascripts/redmine_extensions/redmine_extensions.js
 - app/assets/stylesheets/redmine_extensions/application.css
 - app/controllers/easy_settings_controller.rb
 - app/helpers/redmine_extensions/application_helper.rb
 - app/helpers/redmine_extensions/rendering_helper.rb
+- app/models/easy_entity_assignment.rb
 - app/models/easy_setting.rb
 - app/presenters/redmine_extensions/base_presenter.rb
 - 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_queries/_entities.html.erb
 - app/views/easy_queries/_index.html.erb
 - app/views/easy_queries/_settings.html.erb
@@ -121,6 +125,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20150705172511_create_easy_settings.rb
+- db/migrate/20160519161300_create_entity_assignments.rb
 - lib/generators/redmine_extensions/entity/USAGE
 - lib/generators/redmine_extensions/entity/entity_generator.rb
 - lib/generators/redmine_extensions/entity/templates/_form.html.erb.erb