redmine_extensions 0.0.39 → 0.1.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69aa53880c59eeba8d228b39825f6acd5f9f303a
-  data.tar.gz: 9e7e9d2b63507cd4a9ee8f9145e2a412703e8650
+  metadata.gz: 03e7f631e32d5cbbce9cfd94ab32c76a0e3fb93a
+  data.tar.gz: 5454a96009a0928de22a9c918f487468154f154e
 SHA512:
-  metadata.gz: d32c640609e40752ea5eca7e887d49c3ba54fe98ad6a8bb08a6eb118752bd0b8e0f9eb7c9e853714f947e9a7c22000f93667fa6aa8a4f1b30157ee4c88438497
-  data.tar.gz: f96ccef09fa3848e4adfde7575e71a36a9d9f36bfc273856b9e587490e9ebfa589c28d54c4eb14914142766025cd0a74fa2a58a24a29a9abcba09c89c40b5c92
+  metadata.gz: 9851babf744466f612e6ac074e5bfb27980e27c33dc8cae48c5d3c7c99793bfdd2f19a9f593b8f994f9518475aa3f4aff49138b1052f7c96a5471d081a7d3f60
+  data.tar.gz: 119f3556b21232044b91a4fb05bcc3f0f7b7d3b08df9c4fd61b18edde70ca13c760091818791066a63539218a5b942f250920d05136a5298713e530be21e460b

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

@@ -340,8 +340,6 @@ 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 );
             }
         },
 
@@ -389,7 +387,7 @@ window.closeFlashMessage = (function($element){
                         select.append(option);
                     });
                     $container = $elem.closest('.easy-multiselect-tag-container');
-                    $container.find(':input').prop('disabled', true);
+                    $container.children(':input').prop('disabled', true);
                     $container.children().hide();
                     $container.append(select);
                     that.valueElement = select;
@@ -409,7 +407,7 @@ window.closeFlashMessage = (function($element){
                         that.load(function(){
                             var matcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
                             response($.grep(that.possibleValues, function(val, i) {
-                                return ( !request.term || matcher.test(val.value) );
+                                return ( !that.options.multiple || !request.term || matcher.test(val.value));
                             }));
                         }, function(){
                             response();
@@ -482,16 +480,16 @@ window.closeFlashMessage = (function($element){
         _formatData: function(data) {
             return $.map(data, function(elem, i){
                 var id, value;
-                if (elem instanceof Array) {
-                  value = elem[0];
-                  id = elem[1];
-                } else if (elem instanceof Object) {
-                  value = elem.value;
-                  id = elem.id;
+                if( $.isArray(elem) ) {
+                    value = elem[0];
+                    id = elem[1];
                 } else {
-                  id = value = elem;
-              }
-              return {value: value, id: id};
+                    id = value = elem;
+                }
+                if ( elem !== null && typeof elem === 'object' )
+                    return elem;
+                else
+                    return {value: value, id: id};
             });
         },
 
@@ -544,7 +542,6 @@ 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,7 +551,7 @@ window.closeFlashMessage = (function($element){
 
         setValue: function(values) {
             var that = this;
-            if( typeof values === 'undefined' || !values )
+            if( typeof values == 'undefined' || !values )
                 return false;
 
             if( this.options.preload ) {
@@ -562,63 +559,37 @@ window.closeFlashMessage = (function($element){
                     if( that.options.multiple ) {
                         that.valueElement.entityArray('clear');
                     }
-                    that._setValues(values);
+                    that._setValues(values)
                 });
             } else {
-                if( that.options.multiple ) {
-                    that.valueElement.entityArray('clear');
-                }
-                that._setValues(values);
+                // TODO - where to get real text value?
+                this.element.val(values[0]);
+                this.valueElement.val(values[0]);
             }
         },
 
         _setValues: function(values) {
-            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;
-                        }
+            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);
                     }
-                } 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(with_label) {
-            var result;
-            if ( this.options.multiple && !this.expanded ) {
-              result = this.valueElement.entityArray('getValue'); // entityArray
+        getValue: function() {
+            if( this.options.multiple && !this.expanded ) {
+                return this.valueElement.entityArray('getValue'); // entityArray
             } else if ( this.options.multiple ) {
-              result = this.valueElement.val(); // select multiple=true
+                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;
-              });
+                return [this.valueElement.val()]; // hidden field
             }
-            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 edit_easy_setting_path(@easy_settings)
+      redirect_back_or_default redmine_extensions_engine.edit_easy_setting_path(@easy_settings)
     else
       render :edit
     end

data/app/helpers/redmine_extensions/application_helper.rb

@@ -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])
-        edit_easy_setting_path(plugin, *attrs)
+        redmine_extensions_engine.edit_easy_setting_path(plugin, *attrs)
       else
         super
       end
@@ -44,20 +44,21 @@ 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)
+    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
 
-      if query_class.nil?
-        query_class_name = target_class.name + 'Query'
+    def render_entity_assignments(entity, target_entity, options = {}, &block)
+      options ||= {}
+      collection_name = options.delete(:collection_name) || target_entity.name.pluralize.underscore
+      query_class = query_for_entity(target_entity)
 
-        query_class = query_class_name.constantize #if Object.const_defined?(query_class_name)
-      end
+      return '' if !query_class || !entity.respond_to?(collection_name)
 
-      return '' if !query_class || !(query_class < EasyQuery) || !entity.respond_to?(collection_name)
+      project = options.delete(:project)
 
       query = query_class.new(:name => 'c_query')
       query.project = project
@@ -68,9 +69,8 @@ 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_#{target_class.name.underscore}_plural", :default => 'Heading')
+      options[:heading] ||= l("label_#{query.entity}_plural", :default => 'Heading')
 
       if options[:context_menus_path].nil?
         options[:context_menus_path] = [
@@ -82,9 +82,11 @@ 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, :target_class => target_class, :project => project,
+        :query => query, :project => project,
         :entities => entities, :entities_count => entities_count, :options => options})
     end
 
@@ -106,65 +108,106 @@ module RedmineExtensions
       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
+    # ==== 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 conatiner
+    # ** 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
 
-    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'
+    EasyBoxRenderer = Struct.new(:view, :id, :heading, :options) do
 
-      html = ''
+      attr_writer :container_class, :heading_class, :content_class
+      attr_writer :heading_links, :footer, :icon
+      attr_accessor :content
 
-      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>'
+      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])
+      end
+
+      def collapsed?
+        !!options[:default] || !!options[:collapsed] || !!options[:default_button_state]
+      end
+
+      def footer
+        if block_given?
+          @footer = view.capture { yield }
+        else
+          @footer.to_s.html_safe
+        end
+      end
+
+      def render
+        view.render({partial: 'common/collapsible_module_layout', locals: {renderer: self, content: content}} )
+      end
+      private
+
+      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
       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, multiple: true})
+      options.reverse_merge!({select_first_value: false, show_toggle_button: false, load_immediately: false})
       options[:id] ||= sanitize_to_id(name)
 
       selected_values ||= []
@@ -177,7 +220,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: #{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} });")
+          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement]}, 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
 

data/app/helpers/redmine_extensions/rendering_helper.rb

@@ -20,5 +20,10 @@ module RedmineExtensions
       partial.prepend("#{prefixes.last}/")
       render(*attrs)
     end
+
+    def query_outputs(presenter_or_query, options={})
+      presenter = present(presenter_or_query, options) rescue RedmineExtensions::BasePresenter.new(presenter_or_query, self, options)
+      RedmineExtensions::EasyQueryHelpers::Outputs.new(presenter, self)
+    end
   end
 end

data/app/presenters/easy_query_adapter_presenter.rb

@@ -0,0 +1,50 @@
+class EasyQueryAdapterPresenter < RedmineExtensions::BasePresenter
+
+  # --- GETTERS ---
+  attr_accessor :page_module, :row_limit
+
+  # should be defined in parent in future
+  def initialize(query, view_context=nil, options={})
+    super(query, view_context, options)
+    @query = query
+
+    @page_module = options[:page_module]
+
+  end
+
+  def entities(options={})
+    #can not fetch, cuz gantt is fetching enstead of nil
+    @entities ||= @options[:entities] || h.instance_variable_get(:@entities) #|| model.entities(options)
+  end
+
+  def entity_count(options={})
+    @entity_count ||= h.instance_variable_get(:@entity_count) || model.entity_count(options)
+  end
+
+  def entity_pages
+    @options[:entity_pages] || h.instance_variable_get(:@entity_pages)
+  end
+
+  def available_outputs
+    outputs.available_outputs
+  end
+
+  def outputs
+    @outputs ||= RedmineExtensions::EasyQueryHelpers::Outputs.new(self)
+  end
+
+  # ----- RENDERING HELPERS ----
+
+  def default_name
+    h.l(self.class.name.underscore, :scope => [:easy_query, :name])
+  end
+
+  def name
+    @name ||= options[:easy_query_name] || (model.new_record? ? default_name : model.name)
+  end
+
+  def filters_active?
+    model.filters.any?
+  end
+
+end

data/app/views/common/_collapsible_module_layout.html.erb

@@ -0,0 +1,13 @@
+<div class="module box <%= renderer.container_class %>"<%=raw renderer.collapsible? && %Q{ data-toggle="#{renderer.id}"} || nil %>>
+  <%= content_tag(:div, class: 'module-heading ' + renderer.heading_class, onclick: (renderer.saving_state_enabled? && 'EasyToggler.toggle(this.nextElementSibling, event)' || nil)) do %>
+    <span class="expander module-toggler">&nbsp;</span>
+    <%= content_tag(renderer.heading_tag, renderer.heading, class: renderer.icon) %>
+    <%= content_tag(:span, renderer.heading_links, class: 'module-heading-links') if renderer.heading_links %>
+  <% end %>
+  <div class="module-content" id="<%= renderer.id %>"<%=raw renderer.collapsed? && %q{ style="display:none"} || nil %>>
+    <%= content -%>
+    <%= content_tag(:div, class: 'module-content-footer') do %>
+      <%= renderer.footer %>
+    <% end if renderer.footer.present? %>
+  </div>
+</div>

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

@@ -1,24 +1,20 @@
 <%
-   display_style = options[:display_style] || (entities_count > 3 ? :list : :tile)
-   heading = "#{options[:heading]} (#{entities_count})"
+  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">
+  <div id="<%= options[:module_name] %>_container" class="entity_references_container easy-dropper-target easy-drop-issue" 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) %>
       <%# 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_module_easy_box(options[:module_name], heading+':', {class: {heading: entity_css_icon(query.entity), container: 'module-inside'}, default: false}) do |m| %>
+        <% m.heading_links do %>
+          <%= 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)) %>
+        <% end %>
           <%= 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}) %>
+                                                                      :query => query,
+                                                                      :project => project, :options => options, :referenced_entities => entities}) %>
 
 
         <% if options[:context_menus_path] && respond_to?(options[:context_menus_path]) %>
@@ -26,5 +22,4 @@
         <% end %>
       <% end %>
     </div>
-  </div>
 <% end %>

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

@@ -1,11 +1,3 @@
-<% 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>
+<% query_outputs(query, entities: referenced_entities, options: { hascontextmenu: true, disable_sort: true }).each do |output| %>
+  <%= output.render_data %>
 <% end %>

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

@@ -0,0 +1,7 @@
+<div class="easy-entity-cards-container">
+  <div class="splitcontent">
+    <% query.entities.each do |referenced_entity| %>
+      <%= output.render_entity_tile(referenced_entity) %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,4 +1,4 @@
-<%= form_for(@easy_settings, html: { class: 'form-box easy-setting-plugin-form' }) do |f| %>
+<%= form_for([redmine_extensions_engine, @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,11 +1,7 @@
-# Engine routes
 RedmineExtensions::Engine.routes.draw do
-  resources :easy_settings, except: :destroy
-end
-
-# Redmine routes
-Rails.application.routes.draw do
-  mount RedmineExtensions::Engine => '/redmine_extensions'
 
   resources :easy_settings, except: :destroy
+
 end
+
+RedmineExtensions::Engine.automount!

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

@@ -33,4 +33,4 @@
   <%- if acts_as_attachable? -%>
   <p id="attachments_form"><label><%%= l(:label_attachment_plural) %></label><%%= render :partial => 'attachments/form', :locals => {:container => <%= model_name_underscored %>} %></p>
   <%- end -%>
-<%% end %>
+<%% end %>

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

@@ -1,9 +1,9 @@
-<ul>
-<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
-  <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 button button-positive' %></li>
-<%% end %>
-  <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>
+<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
+  <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 button button-positive' %></li>
+<%% end %>
+  <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/context_menu.html.erb.erb

@@ -1,8 +1,8 @@
-<ul>
-<%% if @<%= model_name_underscored %> -%>
-  <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
-<%% end %>
-  <li><%%= context_menu_link l(:button_delete), <%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-del', disabled: !@can[:delete] %></li>
-
-  <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, {<%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project}) %>
+<ul>
+<%% if @<%= model_name_underscored %> -%>
+  <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
+<%% end %>
+  <li><%%= context_menu_link l(:button_delete), <%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-del', disabled: !@can[:delete] %></li>
+
+  <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, {<%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project}) %>
 </ul>

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

@@ -1,7 +1,7 @@
-class <%= model_name %>CustomField < CustomField
-
-  def type_name
-    :label_<%= @model_name_pluralize_underscored %>
-  end
-
-end
+class <%= model_name %>CustomField < CustomField
+
+  def type_name
+    :label_<%= @model_name_pluralize_underscored %>
+  end
+
+end