redmine_extensions 0.3.00 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 475bbf4d44a8cbffb13eeeebeacd659836bac0f08129670c11c0fdd8fb30d2f2
-  data.tar.gz: 1569eb4186cdf5001d546ecfe7a97e8d07e809915c9cf6ef2b8f586484c315c1
+  metadata.gz: 9e5bdd71d9b581303878b289c07e4fa88fec0f319ee9c94b310db8ffe9bcf71a
+  data.tar.gz: 5c8d77bc0b82467bbb10a2429a984efdeece83f62372ce83f39c51f5977a7f89
 SHA512:
-  metadata.gz: 5e71efb7e7f14d678ca1393949fd71aa1fa2678712bf6ba886f9f93d63af127710a914438ba913e116500c91c892076ccddfc0201b07ea3e597b979a4056a6db
-  data.tar.gz: 93bcf47bcea77726f9c129586e2cdc7289a818e7456a87cbc5f0e3f802ace860625a718ef5db36a7dcdd63e3740bd4bf052a7adfe7c82c3f4785313c6888ee3f
+  metadata.gz: 4a46dc0c10ebbd8e95257516d22e49d4bef13c02fbc2564ad000dfc48f67e960c66ac9a5e4bc2e141bf4697ee3d33eae8a6abf127cd3fa56c1e99ce64a5354f2
+  data.tar.gz: 20a9d5f7e2bc0dabf8465297965b5497bbd5f06b6c3991405ee5d5d66eaab09cb1d110f60ae37a7346bcbe5b6afd1aca70595aeb177d998c342afe40c60a8851

data/Rakefile

@@ -1,49 +1,25 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+require 'bundler/setup'
 
-begin
-  require 'rdoc/task'
+possible_app_dirs = [
+  ENV['DUMMY_PATH'],
+  File.join(Dir.pwd, 'test/dummy')
+]
+dir = possible_app_dirs.compact.first
 
-  desc "Generate documentation for the plugin."
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = "rdoc"
-    rdoc.title = "RedmineExtensions #{RedmineExtensions::VERSION}"
-    rdoc.rdoc_files.include("README*")
-    rdoc.rdoc_files.include("lib/**/*.rb")
-  end
-rescue LoadError
-  puts 'RDocTask is not supported for this platform'
+if !File.directory?(dir)
+  abort("Directory '#{dir}' does not exists")
 end
 
-APP_RAKEFILE = File.expand_path("../spec/redmine/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path(File.join(dir, 'Rakefile'), __dir__)
 load 'rails/tasks/engine.rake'
-
-# load 'rails/tasks/statistics.rake'
+load 'rails/tasks/statistics.rake'
 
 Bundler::GemHelper.install_tasks
 
-Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-
-task :generate_test_plugin do
-  require RedmineExtensions::Engine.root.join('spec', 'support', 'plugin_generator').to_s
-  PluginGenerator.generate_test_plugin!
-end
-RSpec::Core::RakeTask.new(spec: [:generate_test_plugin, 'app:redmine:plugins:migrate']) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.exclude_pattern = 'spec/redmine/**/*_spec.rb'
+namespace :redmine_extensions do
+  task :generate_test_plugin do
+    require_relative 'spec/init_rails'
+    require RedmineExtensions::Engine.root.join('spec', 'support', 'plugin_generator').to_s
+    PluginGenerator.generate_test_plugin!
+  end
 end
-
-# task :redmine_test do |rake|
-#   Rake::Task['app:test'].invoke
-# end
-
-task :default => :spec

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

@@ -6,6 +6,8 @@ module RedmineExtensions
     argument :model_name, type: :string, required: true, banner: 'Post'
     argument :attributes, type: :array, required: true, banner: 'field[:type][:index] field[:type][:index]'
 
+    class_option :rys, type: :boolean, default: false, required: false, desc: "Use in case of RYS"
+
     class_option :associations, type: :array, required: false, banner: '--associations association_type[:association_name][:association_class]'
 
     class_option :project, type: :boolean, default: true, banner: '', :desc => 'make model depends on project'
@@ -25,12 +27,14 @@ module RedmineExtensions
     attr_reader :controller_class, :model_name_underscored, :model_name_pluralize_underscored
     attr_reader :db_columns
     attr_reader :associations
-
+    attr_reader :rys
     def initialize(*args)
       super
+      @rys = !!options["rys"]
       @plugin_name_underscored = plugin_name.underscore
       @plugin_pretty_name = @plugin_name_underscored.titleize
-      @plugin_path = "plugins/#{@plugin_name_underscored}"
+
+      @plugin_path = rys ? "." : "plugins/#{@plugin_name_underscored}"
       @plugin_title = @plugin_name_underscored.camelize
 
       @model_name_underscored = model_name.underscore
@@ -49,8 +53,10 @@ module RedmineExtensions
       template 'edit.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/edit.html.erb"
       template 'edit.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/edit.js.erb"
 
-      template 'controller_spec.rb.erb', "#{plugin_path}/test/spec/controllers/#{model_name_pluralize_underscored}_controller_spec.rb"
-      template 'factories.rb.erb', "#{plugin_path}/test/factories/#{model_name_underscored}.rb"
+      tests_root = rys ? "./spec" : "#{plugin_path}/test"
+      template 'controller_spec.rb.erb', "#{tests_root + (!rys && "/spec" || "")}/controllers/#{model_name_pluralize_underscored}_controller_spec.rb"
+      template 'factories.rb.erb', "#{tests_root}/factories/#{model_name_underscored}.rb"
+      template 'spec/requests/%model_name_underscored%_spec.rb.tt', "#{tests_root}/requests/#{model_name_underscored}.rb"
 
       if File.exists?("#{plugin_path}/config/locales/en.yml")
         original_langfile = YAML.load_file("#{plugin_path}/config/locales/en.yml")
@@ -95,31 +101,32 @@ module RedmineExtensions
         if File.exists?("#{plugin_path}/extra/easy_patch/easy_extensions/helpers/entity_attribute_helper_patch.rb")
 
           inject_into_file "#{plugin_path}/extra/easy_patch/easy_extensions/helpers/entity_attribute_helper_patch.rb",
-              "\n       def format_html_#{model_name_underscored}_attribute(entity_class, attribute, unformatted_value, options={})" +
-              "\n          value = format_entity_attribute(entity_class, attribute, unformatted_value, options)" +
-              "\n          case attribute.name" +
-              "\n          when :name" +
-              "\n            link_to(value, #{model_name_underscored.singularize}_path(options[:entity].id))" +
-              "\n          else" +
-              "\n            h(value)" +
-              "\n          end" +
-              "\n        end" +
-              "\n", after: "base.class_eval do"
+                           "\n       def format_html_#{model_name_underscored}_attribute(entity_class, attribute, unformatted_value, options={})" +
+                             "\n          value = format_entity_attribute(entity_class, attribute, unformatted_value, options)" +
+                             "\n          case attribute.name" +
+                             "\n          when :name" +
+                             "\n            link_to(value, #{model_name_underscored.singularize}_path(options[:entity].id))" +
+                             "\n          else" +
+                             "\n            h(value)" +
+                             "\n          end" +
+                             "\n        end" +
+                             "\n", after: "base.class_eval do"
 
         end
       else
         template 'query.rb.erb', "#{plugin_path}/app/models/#{model_name_underscored}_query.rb"
       end
 
-      if File.exists?("#{plugin_path}/config/routes.rb")
+      routes_file = "#{plugin_path}/config/routes.rb"
+      if File.exists?(routes_file)
         if project?
-          append_to_file "#{plugin_path}/config/routes.rb" do
+          insert_into_file routes_file, before: (rys ? /end\z/ : /\z/) do
             "\nresources :projects do " +
               "\n  resources :#{model_name_pluralize_underscored}" +
               "\nend\n"
           end
         end
-        append_to_file "#{plugin_path}/config/routes.rb" do
+        insert_into_file routes_file, before: (rys ? /end\z/ : /\z/) do
           "\nresources :#{model_name_pluralize_underscored} do" +
             "\n  collection do " +
             "\n    get 'autocomplete'" +
@@ -166,10 +173,56 @@ module RedmineExtensions
         s << "\nend"
 
         append_to_file "#{plugin_path}/after_init.rb", s
+      elsif rys
+        s = ""
+        s << "\n  Redmine::AccessControl.map do |map|"
+        s << "\n    map.easy_category :#{model_name_pluralize_underscored} do |pmap|"
+        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"
+        append_to_file "./config/initializers/01_access_control.rb", s
+
+        s = ""
+        s << "\n  Redmine::MenuManager.map :top_menu do |menu|"
+        s << "\n    menu.push :#{model_name_pluralize_underscored}, { controller: '#{model_name_pluralize_underscored}', action: 'index', project_id: nil }, caption: :label_#{model_name_pluralize_underscored}"
+        s << "\n  end\n"
+        if project?
+          s << "\n  Redmine::MenuManager.map :project_menu do |menu|"
+          s << "\n    menu.push :#{model_name_pluralize_underscored}, { controller: '#{model_name_pluralize_underscored}', action: 'index' }, param: :project_id, caption: :label_#{model_name_pluralize_underscored}"
+          s << "\n  end\n"
+        end
+        append_to_file "./config/initializers/02_menu_manager.rb", s
+        s = ""
+        if acts_as_customizable?
+          s << "\n  CustomFieldsHelper::CUSTOM_FIELDS_TABS << {name: '#{model_name}CustomField', partial: 'custom_fields/index', label: :label_#{model_name_pluralize_underscored}}\n"
+        end
+        if acts_as_searchable?
+          s << "\n  Redmine::Search.map do |search|"
+          s << "\n    search.register :#{model_name_pluralize_underscored}"
+          s << "\n  end\n"
+        end
+        if acts_as_activity_provider?
+          s << "\n  Redmine::Activity.map do |activity|"
+          s << "\n    activity.register :#{model_name_pluralize_underscored}, {class_name: %w(#{model_name}), default: false}"
+          s << "\n  end\n"
+        end
+        other_initializer = "./config/initializers/06_others.rb"
+        if File.exist?(other_initializer)
+          append_file other_initializer do
+            s
+          end
+        else
+          create_file other_initializer do
+            s
+          end
+        end
+
       end
 
 
       template 'show.api.rsb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.api.rsb"
+      template '_%model_name_underscored%.api.rsb.tt', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/_#{model_name_underscored}.api.rsb"
       template 'show.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.html.erb"
       template 'show.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/show.js.erb"
     end
@@ -239,15 +292,15 @@ module RedmineExtensions
         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}
+          @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['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"}
+      @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
 
     def prepare_associations
@@ -259,7 +312,7 @@ module RedmineExtensions
         assoc_type, assoc_name, assoc_class = assoc.split(':')
         next if assoc_type.blank? || assoc_name.blank?
 
-        @associations[assoc_name] = {type: assoc_type, class: assoc_class}
+        @associations[assoc_name] = { type: assoc_type, class: assoc_class }
 
         assoc_model_class = assoc_class.presence || assoc_name.singularize.camelize
         assoc_model_filename = assoc_model_class.underscore
@@ -283,7 +336,7 @@ module RedmineExtensions
             end
           end
 
-          @db_columns["#{assoc_model_class.underscore.singularize}_id"] = {type: 'integer', idx: true, lang_key: assoc_model_class.underscore, query_type: 'list_optional', null: true}
+          @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

data/lib/generators/redmine_extensions/entity/templates/_%model_name_underscored%.api.rsb.tt

@@ -0,0 +1,18 @@
+local_assigns[:api].<%= model_name_underscored %> do
+  local_assigns[:api].id <%= model_name_underscored %>.id
+  <%- db_columns.keys.each do |column_name| -%>
+  local_assigns[:api].<%= column_name %> <%= model_name_underscored %>.<%= column_name %>
+  <%- end -%>
+  <%- if acts_as_customizable? -%>
+  render_api_custom_values <%= model_name_underscored %>.visible_custom_field_values, local_assigns[:api]
+  <%- end -%>
+  <%- if acts_as_attachable? -%>
+  local_assigns[:api].array :attachments do
+    <%= model_name_underscored %>.attachments.each do |attachment|
+      render_api_attachment attachment, local_assigns[:api]
+    end
+  end if include_in_api_response?('attachments')
+  <%- end -%>
+
+  call_hook :helper_render_api_<%= model_name_underscored %>, { api: local_assigns[:api], <%= model_name_underscored %>: <%= model_name_underscored %> }
+end

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

@@ -48,7 +48,7 @@ class <%= controller_class %>Controller < ApplicationController
   end
 
   def create
-    @<%= model_name_underscored %> = <%= model_name %>.new
+    @<%= model_name_underscored %> = <%= model_name %>.new<%= "author: User.current" if author? %>
     <%- if project? -%>
     @<%= model_name_underscored %>.project = @project
     <%- end -%>
@@ -57,17 +57,15 @@ class <%= controller_class %>Controller < ApplicationController
     @<%= model_name_underscored %>.save_attachments(params[:attachments] || (params[:<%= model_name_underscored %>] && params[:<%= model_name_underscored %>][:uploads]))
     <%- end -%>
 
-    if @<%= model_name_underscored %>.save
-      respond_to do |format|
-        format.html {
+    respond_to do |format|
+      if @<%= model_name_underscored %>.save
+        format.html do
           flash[:notice] = l(:notice_successful_create)
           redirect_back_or_default <%= model_name_underscored %>_path(@<%= model_name_underscored %>)
-        }
+        end
         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|
+      else
         format.html { render action: 'new' }
         format.api { render_validation_errors(@<%= model_name_underscored %>) }
         format.js { render action: 'new' }
@@ -90,17 +88,15 @@ class <%= controller_class %>Controller < ApplicationController
     @<%= model_name_underscored %>.save_attachments(params[:attachments] || (params[:<%= model_name_underscored %>] && params[:<%= model_name_underscored %>][:uploads]))
     <%- end -%>
 
-    if @<%= model_name_underscored %>.save
-      respond_to do |format|
-        format.html {
+    respond_to do |format|
+      if @<%= model_name_underscored %>.save
+        format.html do
           flash[:notice] = l(:notice_successful_update)
           redirect_back_or_default <%= model_name_underscored %>_path(@<%= model_name_underscored %>)
-        }
+        end
         format.api { render_api_ok }
         format.js { render template: 'common/close_modal' }
-      end
-    else
-      respond_to do |format|
+      else
         format.html { render action: 'edit' }
         format.api { render_validation_errors(@<%= model_name_underscored %>) }
         format.js { render action: 'edit' }
@@ -109,15 +105,13 @@ class <%= controller_class %>Controller < ApplicationController
   end
 
   def destroy
-    @<%= model_name_pluralize_underscored %>.each do |<%= model_name_underscored %>|
-      <%= model_name_underscored %>.destroy
-    end
+    @<%= model_name_pluralize_underscored %>.each(&:destroy)
 
     respond_to do |format|
-      format.html {
+      format.html do
         flash[:notice] = l(:notice_successful_delete)
         redirect_back_or_default <%= model_name_pluralize_underscored %>_path
-      }
+      end
       format.api { render_api_ok }
     end
   end

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

@@ -1,8 +1,9 @@
-require Rails.root.join('plugins', 'easyproject', 'easy_plugins', 'easy_extensions/test/spec/spec_helper')
-
-describe <%= controller_class %>Controller, logged: true do
+<% unless rys %>
+require "easy_extensions/spec_helper"
+<% end %>
+RSpec.describe <%= controller_class %>Controller, logged: true do
   let(:<%= model_name_underscored %>) { FactoryBot.create(:<%= model_name_underscored %>) }
-  let(:<%= model_name_pluralize_underscored %>) { FactoryBot.create_list(:<%= model_name_underscored %>, 5) }
+  let(:<%= model_name_pluralize_underscored %>) { FactoryBot.create_list(:<%= model_name_underscored %>, 2) }
 
   before(:each) do
     role = Role.non_member
@@ -21,7 +22,7 @@ describe <%= controller_class %>Controller, logged: true do
   end
 
   it 'show' do
-    get :show, {id: <%= model_name_underscored %>}
+    get :show, params: { id: <%= model_name_underscored %> }
     expect(response).to have_http_status(:success)
     expect(response).to render_template('<%= model_name_pluralize_underscored %>/show')
   end
@@ -33,45 +34,41 @@ describe <%= controller_class %>Controller, logged: true do
   end
 
   it 'create with invalid' do
-    post :create, {<%= model_name_underscored %>: {}}
-    expect(response).to have_http_status(:success)
-    expect(assigns[:<%= model_name_underscored %>]).to be_a_new(<%= model_name %>)
+    post :create, params: { <%= model_name_underscored %>: { } }
     expect(response).to render_template('<%= model_name_pluralize_underscored %>/new')
+    expect(assigns[:<%= model_name_underscored %>]).to be_a_new(<%= model_name %>)
   end
 
   it 'create with valid' do
-    post :create, {<%= model_name_underscored %>: FactoryBot.attributes_for(:<%= model_name_underscored %>)}
-    expect(response).to have_http_status(:success)
-    expect(assigns[:<%= model_name_underscored %>]).not_to be_a_new(<%= model_name %>)
+    post :create, params: { <%= model_name_underscored %>: FactoryBot.attributes_for(:<%= model_name_underscored %>) }
     expect(response).to redirect_to(<%= model_name_underscored %>_path(assigns[:<%= model_name_underscored %>]))
+    expect(assigns[:<%= model_name_underscored %>]).not_to be_a_new(<%= model_name %>)
   end
 
   it 'edit' do
-    get :edit, {id: <%= model_name_underscored %>}
+    get :edit, params: { id: <%= model_name_underscored %> }
     expect(response).to have_http_status(:success)
     expect(response).to render_template('<%= model_name_pluralize_underscored %>/edit')
   end
 
   it 'update with invalid' do
-    put :update, {id: <%= model_name_underscored %>, <%= model_name_underscored %>: {<%= safe_columns.first %>: ''}}
-    expect(response).to have_http_status(:success)
-    expect(assigns[:<%= model_name_underscored %>].valid?).to be false
+    put :update, params: { id: <%= model_name_underscored %>, <%= model_name_underscored %>: { <%= safe_columns.first[0] %>: '' } }
     expect(response).to render_template('<%= model_name_pluralize_underscored %>/edit')
+    expect(assigns[:<%= model_name_underscored %>].valid?).to be false
   end
 
   it 'update with valid' do
-    put :update, {id: <%= model_name_underscored %>, <%= model_name_underscored %>: {<%= safe_columns.first %>: 'Tralalala'}}
-    expect(response).to have_http_status(:success)
-    expect(assigns[:<%= model_name_underscored %>].valid?).to be true
+    put :update, params: { id: <%= model_name_underscored %>, <%= model_name_underscored %>: { <%= safe_columns.first[0] %>: 'Tralalala' } }
     expect(response).to redirect_to(<%= model_name_underscored %>_path(assigns[:<%= model_name_underscored %>]))
+    expect(assigns[ :<%= model_name_underscored %>].valid?).to be true
   end
 
   it 'destroy' do
-    <%= model_name_underscored %>
-    <%= model_name_pluralize_underscored %>
+      <%= model_name_underscored %>
+      <%= model_name_pluralize_underscored %>
 
-    expect(<%= model_name %>.count).to eq(6)
-    expect {delete :destroy, {id: <%= model_name_underscored %>}}.to change(<%= model_name %>, :count).by(-1)
+    expect(<%= model_name %>.count).to eq(3)
+    expect { delete :destroy, params: { id: <%= model_name_underscored %> } }.to change(<%= model_name %>, :count).by(-1)
     expect(response).to redirect_to(<%= model_name_pluralize_underscored %>_path)
     expect(response).to redirect_to(<%= model_name_pluralize_underscored %>_path)
   end

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

@@ -18,17 +18,15 @@ class <%= model_name %>Query < EasyQuery
     end
 
   def initialize_available_columns
-    return @available_columns if @available_columns
     group = l("label_filter_group_#{self.class.name.underscore}")
 
   <%- 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 %>), title: <%= model_name %>.human_attribute_name(:<%= column_name %>), group: group
   <%- end -%>
   <%- if acts_as_customizable? -%>
-    @available_columns += <%= model_name %>CustomField.visible.collect { |cf| EasyQueryCustomFieldColumn.new(cf, :group => l(:label_filter_group_custom_fields)) }
+    add_available_columns <%= model_name %>CustomField.sorted.visible.collect { |cf| EasyQueryCustomFieldColumn.new(cf, group: l(:label_filter_group_custom_fields))}
   <%- end -%>
 
-    @available_columns
   end
 
   def default_list_columns