redmine_extensions 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7495846c82f712c1753c94dbf41cdedb9d1d78
-  data.tar.gz: 9195fa39143a338c916132cdb4bcf11db76b4320
+  metadata.gz: e9dafb1894abe51656840de62914a350b3c9d78c
+  data.tar.gz: 6dcbff3717bfac6323606d4dffd6bb959ae5bf42
 SHA512:
-  metadata.gz: 00f1c48572a81fda0a7d3bf5e9eeae51ecb2827ef5e26de29dcf9285e8aca65950c0ba17664fe5a627c3ce6752abb810eb968278efbd6873a5a638789c283d2b
-  data.tar.gz: b33b94bd8821b076b4bfef9dbb0a57008f87ea8570af100a76eb6fcfe88cac3bdde487c015d11d8ae1eeb95fbf28290b7ff3a03a9611d89da81c3c33b6509de8
+  metadata.gz: 491d56cfee43c1daed176f2f94551daf40d02fb4718d215fb37743e634a8b439dd53f6db1c18f0be6a654c584ca0b6ebea8027018669b80a4077bd57b1e15d69
+  data.tar.gz: 0f2b44330b8a107a674b06652acd5bc82f91354c60f58065ffec60e76d1a30903ae0d1552695b1f634f37cf379bef2e859d32517870f890b66423051cd11db37

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

@@ -50,22 +50,15 @@ module RedmineExtensions
       template 'edit.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/edit.js.erb"
 
       if File.exists?("#{plugin_path}/config/locales/en.yml")
-        append_to_file "#{plugin_path}/config/locales/en.yml" do
-          "\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}" +
-            "\n  heading_#{model_name_underscored}_edit: Edit #{model_name_underscored.titleize}" +
-            "\n  button_#{model_name_underscored}_new: New #{model_name_underscored.titleize}" +
-            "\n  label_#{model_name_pluralize_underscored}: #{@model_name_pluralize_underscored.titleize}" +
-            "\n  label_#{model_name_underscored}: #{model_name_underscored.titleize}" +
-            "\n  permission_view_#{model_name_pluralize_underscored}: View #{model_name_pluralize_underscored.titleize}" +
-            "\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}"
+        original_langfile = YAML.load_file("#{plugin_path}/config/locales/en.yml")
+
+        template 'en.yml.erb', "#{plugin_path}/tmp/tmp_en.yml"
+        added_translations = YAML.load_file("#{plugin_path}/tmp/tmp_en.yml")
+        File.delete("#{plugin_path}/tmp/tmp_en.yml")
+
+        merged_langfile = original_langfile.deep_merge(added_translations)
+        File.open("#{plugin_path}/config/locales/en.yml", "w") do |file|
+          file.write merged_langfile.to_yaml
         end
       else
         template 'en.yml.erb', "#{plugin_path}/config/locales/en.yml"
@@ -85,7 +78,7 @@ module RedmineExtensions
         template 'mail_updated.text.erb.erb', "#{plugin_path}/app/views/#{model_name_underscored}_mailer/#{model_name_underscored}_updated.text.erb"
       end
 
-      template 'migration.rb.erb', "#{plugin_path}/db/migrate/#{Time.now.strftime('%Y%m%d%H%M%S')}_create_#{@model_name_pluralize_underscored}.rb"
+      template 'migration.rb.erb', "#{plugin_path}/db/migrate/#{Time.now.strftime('%Y%m%d%H%M%S%L')}_create_#{@model_name_pluralize_underscored}.rb"
       template 'model.rb.erb', "#{plugin_path}/app/models/#{model_name_underscored}.rb"
       template 'new.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/new.html.erb"
       template 'new.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/new.js.erb"
@@ -113,7 +106,7 @@ module RedmineExtensions
         template 'routes.rb.erb', "#{plugin_path}/config/routes.rb"
       end
 
-      if File.exists?("#{plugin_path}/init.rb")
+      if File.exists?("#{plugin_path}/after_init.rb")
         s = "\nActiveSupport.on_load(:easyproject, yield: true) do"
         s << "\n  require '#{plugin_name_underscored}/#{model_name_underscored}_hooks'\n"
         s << "\n  Redmine::AccessControl.map do |map|"
@@ -145,7 +138,7 @@ module RedmineExtensions
         end
         s << "\nend"
 
-        append_to_file "#{plugin_path}/init.rb", s
+        append_to_file "#{plugin_path}/after_init.rb", s
       end
 
 
@@ -216,12 +209,16 @@ module RedmineExtensions
         attr_name, attr_type, attr_idx = attr.split(':')
         #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}
+        if attr_type == 'timestamp'
+          @timestamp_exist = true
+        else
+          @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
       end
 
       @db_columns['project_id'] = {type: 'integer', idx: nil, null: false, safe: false, class: 'Project', list_class_name: 'name', query_type: 'list_optional', query_column_name: 'project', lang_key: "field_#{model_name_underscored}_project"} if project? && !@db_columns.key?('project_id')
       @db_columns['author_id'] = {type: 'integer', idx: nil, null: false, safe: true, class: 'User', list_class_name: 'name', query_type: 'list', query_column_name: 'author', lang_key: "field_#{model_name_underscored}_author"} if author? && !@db_columns.key?('author_id')
+
       @db_columns['created_at'] = {type: 'datetime', idx: nil, null: false, safe: false, query_type: 'date', lang_key: "field_#{model_name_underscored}_created_at"}
       @db_columns['updated_at'] = {type: 'datetime', idx: nil, null: false, safe: false, query_type: 'date', lang_key: "field_#{model_name_underscored}_updated_at"}
     end
@@ -259,7 +256,7 @@ module RedmineExtensions
             end
           end
 
-          @db_columns["#{assoc_model_class.underscore.singularize}_id"] = {type: 'integer', idx: true, null: false}
+          @db_columns["#{assoc_model_class.underscore.singularize}_id"] = {type: 'integer', idx: true, lang_key: assoc_model_class.underscore, query_type: 'list_optional', null: true}
         end
       end
     end
@@ -303,11 +300,11 @@ module RedmineExtensions
     end
 
     def edit_permission
-      "edit_#{@model_name_pluralize_underscored}"
+      "manage_#{@model_name_pluralize_underscored}"
     end
 
     def delete_permission
-      "edit_#{@model_name_pluralize_underscored}"
+      "manage_#{@model_name_pluralize_underscored}"
     end
 
   end

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

@@ -18,6 +18,10 @@
     <%- elsif column_options[:query_type] == 'text' -%>
     <%%= f.text_area :<%= column_name %>, :cols => 60, :rows => (<%= model_name_underscored %>.<%= column_name %>.blank? ? 10 : [[10, <%= model_name_underscored %>.<%= column_name %>.length / 50].max, 100].min), :accesskey => accesskey(:edit), :class => 'wiki-edit' %>
     <%%= wikitoolbar_for '<%= model_name_underscored %>_<%= column_name %>' %>
+    <%- elsif column_options[:query_type] == 'boolean' -%>
+    <%%= f.radio_button :<%= column_name %>, false %>
+    <%- else -%>
+    <%%= f.text_field :<%= column_name %> %>
     <%- end -%>
   </p>
   <%% end %>

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

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

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

@@ -8,7 +8,7 @@
     <ul>
       <%% <%= model_name %>.statuses.keys.each do |s| -%>
         <li>
-          <%%= context_menu_link l("<%= model_name_underscored %>.statuses.#{s}"), bulk_update_<%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, <%= model_name_underscored %>: {status: s}, back_url: @back), method: :put,
+          <%%= context_menu_link l("<%= model_name_underscored %>.statuses.#{s}"), bulk_update_<%= model_name_underscored %>_path(id: @<%= model_name_underscored %>_ids, <%= model_name_underscored %>: {status: s}, back_url: @back), method: :put,
                                   selected: (@selected[:status] == s), disabled: !@can[:edit], confirm: l(:text_are_you_sure) %>
         </li>
       <%% end -%>

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

@@ -2,8 +2,8 @@ class <%= controller_class %>Controller < ApplicationController
 
   menu_item :<%= model_name_pluralize_underscored %>
 
-  before_filter :find_<%= model_name_underscored %>, :only => [:show, :edit, :update]
-  before_filter :find_<%= model_name_pluralize_underscored %>, :only => [:context_menu, :bulk_edit, :bulk_update, :destroy]
+  before_filter :find_<%= model_name_underscored %>, only: [:show, :edit, :update]
+  before_filter :find_<%= model_name_pluralize_underscored %>, only: [:context_menu, :bulk_edit, :bulk_update, :destroy]
   <%- if project? -%>
   before_filter :find_project
   <%- end -%>
@@ -11,6 +11,7 @@ class <%= controller_class %>Controller < ApplicationController
 
   helper :<%= model_name_pluralize_underscored %>
   helper :custom_fields
+  helper :context_menus
   helper :attachments
   helper :issues
   include_query_helpers
@@ -58,14 +59,14 @@ class <%= controller_class %>Controller < ApplicationController
           flash[:notice] = l(:notice_successful_create)
           redirect_back_or_default <%= model_name_underscored %>_path(@<%= model_name_underscored %>)
         }
-        format.api { render :action => 'show', :status => :created, :location => <%= model_name_underscored %>_url(@<%= model_name_underscored %>) }
-        format.js { render :template => 'common/close_modal' }
+        format.api { render action: 'show', status: :created, location: <%= model_name_underscored %>_url(@<%= model_name_underscored %>) }
+        format.js { render template: 'common/close_modal' }
       end
     else
       respond_to do |format|
-        format.html { render :action => 'new' }
+        format.html { render action: 'new' }
         format.api { render_validation_errors(@<%= model_name_underscored %>) }
-        format.js { render :action => 'new' }
+        format.js { render action: 'new' }
       end
     end
   end
@@ -92,13 +93,13 @@ class <%= controller_class %>Controller < ApplicationController
           redirect_back_or_default <%= model_name_underscored %>_path(@<%= model_name_underscored %>)
         }
         format.api { render_api_ok }
-        format.js { render :template => 'common/close_modal' }
+        format.js { render template: 'common/close_modal' }
       end
     else
       respond_to do |format|
-        format.html { render :action => 'edit' }
+        format.html { render action: 'edit' }
         format.api { render_validation_errors(@<%= model_name_underscored %>) }
-        format.js { render :action => 'edit' }
+        format.js { render action: 'edit' }
       end
     end
   end
@@ -122,13 +123,13 @@ class <%= controller_class %>Controller < ApplicationController
 
   def bulk_update
     unsaved, saved = [], []
-    attributes = parse_params_for_bulk_update([:<%= model_name_underscored %>])
+    attributes = parse_params_for_bulk_update(params[:<%= model_name_underscored %>])
     @<%= model_name_pluralize_underscored %>.each do |entity|
       entity.init_journal(User.current) if entity.respond_to? :init_journal
       entity.safe_attributes = attributes
       if entity.save
         saved << entity
-        else
+      else
         unsaved << entity
       end
     end
@@ -157,8 +158,9 @@ class <%= controller_class %>Controller < ApplicationController
     @<%= model_name_underscored %>_ids, @safe_attributes, @selected = [], [], {}
     @<%= model_name_pluralize_underscored %>.each do |e|
       @<%= model_name_underscored %>_ids << e.id
-      @safe_attributes.concat e.safe_attribute_names(User.current)
-      <%= model_name %>.safe_attribute_names.each do |c|
+      @safe_attributes.concat e.safe_attribute_names
+      attributes = e.safe_attribute_names - (%w(custom_field_values custom_fields))
+      attributes.each do |c|
         column_name = c.to_sym
         if @selected.key? column_name
           @selected[column_name] = nil if @selected[column_name] != e.send(column_name)
@@ -185,7 +187,8 @@ class <%= controller_class %>Controller < ApplicationController
   end
 
   def find_<%= model_name_pluralize_underscored %>
-    @<%= model_name_pluralize_underscored %> = <%= model_name %>.visible.where(:id => (params[:id] || params[:ids])).to_a
+    @<%= model_name_pluralize_underscored %> = <%= model_name %>.visible.where(id: (params[:id] || params[:ids])).to_a
+    @<%= model_name_underscored %> = @<%= model_name_pluralize_underscored %>.first if @<%= model_name_pluralize_underscored %>.count == 1
     raise ActiveRecord::RecordNotFound if @<%= model_name_pluralize_underscored %>.empty?
     raise Unauthorized unless @<%= model_name_pluralize_underscored %>.all?(&:visible?)
     @projects = @<%= model_name_pluralize_underscored %>.collect(&:project).compact.uniq
@@ -196,8 +199,8 @@ class <%= controller_class %>Controller < ApplicationController
 
   <%- if project? -%>
   def find_project
-    @project ||= @<%= model_name_underscored %>.project if !@<%= model_name_underscored %>.nil?
-    @project ||= Project.find(params[:project_id]) if !params[:project_id].blank?
+    @project ||= @<%= model_name_underscored %>.project if @<%= model_name_underscored %>
+    @project ||= Project.find(params[:project_id]) if params[:project_id].present?
   rescue ActiveRecord::RecordNotFound
     render_404
   end

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

data/lib/generators/redmine_extensions/entity/templates/edit.js.erb.erb

@@ -1,17 +1,18 @@
-$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/edit', :formats => [:html]) %>");
-showModal('ajax-modal');
+var modal = $("#ajax-modal");
+modal.html("<%%= j render(template: '<%= model_name_pluralize_underscored %>/edit', formats: [:html]) %>");
+showModal(modal.attr("id"));
 var submitButton = {
-  text:"<%%=j l(:button_update) -%%>",
-  title:"<%%=j l(:button_update) -%%>",
+  text:"<%%=j l(:button_update) -%>",
+  title:"<%%=j l(:button_update) -%>",
   click: function() {$(this).find('form').submit()},
   'class': 'button-positive'
-}
+};
 var closeButton = {
-  text: "<%%=j l(:button_close) -%%>",
-  title: "<%%=j l(:button_close) -%%>",
+  text: "<%%=j l(:button_close) -%>",
+  title: "<%%=j l(:button_close) -%>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
+};
+modal.dialog('option', {
   buttons: [closeButton, submitButton]
 });

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

@@ -1,8 +1,7 @@
 en:
   activerecord:
     attributes:
-      <%= model_name_underscored %>:
-<%= db_columns.collect{|column_name, column_options| "\n        #{column_options[:lang_key]}: #{column_name.humanize}"  }.join %>
+      <%= 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 %>

data/lib/generators/redmine_extensions/entity/templates/index.api.rsb.erb

@@ -1,5 +1,5 @@
-api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
-  @entities.each do |<%= model_name_underscored %>|
-    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
-  end
-end
+api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
+  @entities.each do |<%= model_name_underscored %>|
+    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
+  end
+end

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

@@ -1,5 +1,7 @@
 <%%= render @query %>
 <%% ### PAGE CUSTOMS ########################################################## %>
+<%%= context_menu context_menu_<%= model_name_pluralize_underscored %>_path(:project_id => @project) %>
 <%% content_for :sidebar do %>
   <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+  <%%= render :partial => 'sidebar/saved_easyqueries_by_type', :locals => {:query_class => @query.class, :project => @project} %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/index.js.erb.erb

@@ -1,11 +1,12 @@
-$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/index', :formats => [:html]) %>");
-showModal('ajax-modal');
+var modal = $("#ajax-modal");
+modal.html("<%%= j render(template: '<%= model_name_pluralize_underscored %>/index', formats: [:html]) %>");
+showModal(modal.attr("id"));
 var closeButton = {
-  text: "<%%=j l(:button_close) -%%>",
-  title: "<%%=j l(:button_close) -%%>",
+  text: "<%%=j l(:button_close) -%>",
+  title: "<%%=j l(:button_close) -%>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
+};
+modal.dialog('option', {
   buttons: [closeButton, submitButton]
 });

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

@@ -1 +1 @@
-<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>
+<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>

data/lib/generators/redmine_extensions/entity/templates/mail_added.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/mail_updated.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

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

@@ -1,9 +1,11 @@
 class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration
   def change
     create_table :<%= model_name_pluralize_underscored %>, force: true do |t|
-      <%- db_columns.each do |column_name, column_attrs| -%>
+      <%- columns = db_columns.reject{|k| k.in?(["created_at", "updated_at"])} -%>
+      <%- columns.each do |column_name, column_attrs| -%>
       t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
       <%- end -%>
+      t.timestamps null: false
     end
   end
 end

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

@@ -2,7 +2,7 @@ class <%= model_name %> < ActiveRecord::Base
   include Redmine::SafeAttributes
 
   <%= 'belongs_to :project' if project? %>
-  <%= 'belongs_to :author, class_name: \'User\', foreign_key: \'author_id\'' if author? %>
+  <%= 'belongs_to :author, class_name: \'User\''  if author? %>
 
   scope :visible, lambda { |*args|
     where(<%= model_name %>.visible_condition(args.shift || User.current, *args))<%= '.joins(:project)' if project? %>
@@ -33,8 +33,8 @@ class <%= model_name %> < ActiveRecord::Base
   acts_as_watchable
   <%- end -%>
 
-  <%= 'validates :project_id, :presence => true' if project? %>
-  <%= 'validates :author_id, :presence => true' if author? %>
+  <%= 'validates :project_id, presence: true' if project? %>
+  <%= 'validates :author_id, presence: true' if author? %>
 
   attr_protected :id
 
@@ -53,7 +53,7 @@ class <%= model_name %> < ActiveRecord::Base
   safe_attributes 'custom_field_values', 'custom_fields'
   <%- end -%>
   <%- if project? -%>
-  safe_attributes 'project_id', :if => lambda {|<%= model_name_underscored %>, user| <%= model_name_underscored %>.new_record? }
+  safe_attributes 'project_id', if: ->(<%= model_name_underscored %>, _user) { <%= model_name_underscored %>.new_record? }
   <%- end -%>
 
   <%- if mail? -%>

data/lib/generators/redmine_extensions/entity/templates/new.js.erb.erb

@@ -1,17 +1,18 @@
-$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/new', :formats => [:html]) %>");
-showModal('ajax-modal');
+var modal = $("#ajax-modal");
+modal.html("<%%= j render(template: '<%= model_name_pluralize_underscored %>/new', formats: [:html]) %>");
+showModal(modal.attr("id"));
 var submitButton = {
-  text:"<%%=j l(:button_create) -%%>",
-  title:"<%%=j l(:button_create) -%%>",
+  text:"<%%=j l(:button_create) -%>",
+  title:"<%%=j l(:button_create) -%>",
   click: function() {$(this).find('form').submit()},
   'class': 'button-positive'
-}
+};
 var closeButton = {
-  text: "<%%=j l(:button_close) -%%>",
-  title: "<%%=j l(:button_close) -%%>",
+  text: "<%%=j l(:button_close) -%>",
+  title: "<%%=j l(:button_close) -%>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
+};
+modal.dialog('option', {
   buttons: [closeButton, submitButton]
 });

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

@@ -9,7 +9,7 @@ class <%= model_name %>Query < EasyQuery
       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 -%>
 
@@ -22,17 +22,20 @@ 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 %>', caption: ::<%= 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 %>), title: ::<%= model_name %>.human_attribute_name(:<%= column_name %>)
       <%- end -%>
     <%- if acts_as_customizable? -%>
-    @available_columns += <%= model_name %>CustomField.visible.collect {|cf| QueryCustomFieldColumn.new(cf) }
+    @available_columns += <%= model_name %>CustomField.visible.collect { |cf| EasyQueryCustomFieldColumn.new(cf, :group => default_cf_group) }
     <%- end -%>
 
     @available_columns
   end
 
-  def default_columns_names
-    super.presence || <%= db_columns.collect{|column_name, column_options| (column_options[:query_column_name] || column_name).to_sym}[0..3].to_s %>.flat_map{|c| [c.to_s, c.to_sym]}
+  def default_list_columns
+    super.presence || <%= db_columns.collect{|column_name, column_options| (column_options[:query_column_name] || column_name).to_s}[0..3].to_s %>.flat_map{|c| [c.to_s, c.to_sym]}
   end
 
+  def default_columns_names
+    super.presence || <%= db_columns.collect{|column_name, column_options| (column_options[:query_column_name] || column_name).to_s}[0..3].to_s %>.flat_map{|c| [c.to_s, c.to_sym]}
+  end
 end