engine2 1.0.5 → 1.0.6

data/conf/message.yaml

@@ -8,6 +8,7 @@
 :error:                         Error
 :no_entry:                      Entry doesnt exist
 :decode_selected:               selected
+:list_select_selected:          Selected
 
 :name:                          Name
 :mime:                          Mime

data/conf/message_pl.yaml

@@ -8,6 +8,7 @@
 :error:                         Błąd
 :no_entry:                      Wpis nie istnieje
 :decode_selected:               wybranych
+:list_select_selected:          Wybranych
 
 :name:                          Nazwa
 :mime:                          Mime

data/config.coffee

@@ -9,7 +9,7 @@ exports.config =
         "bootstrap-additions": ["dist/bootstrap-additions.css"]
         "angular-motion": ["dist/angular-motion.css"]
         "angular-ui-tree": ["dist/angular-ui-tree.css"]
-        "font-awesome": ["css/font-awesome.css"]
+        "fork-awesome": ["css/fork-awesome.css"]
 
   modules:
     definition: 'commonjs'
@@ -64,7 +64,7 @@ exports.config =
 
     copycat:
       fonts: [
-        "node_modules/font-awesome/fonts"
+        "node_modules/fork-awesome/fonts"
         "node_modules/bootstrap/fonts"
       ]
       verbose: true

data/engine2.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
     spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
     spec.require_paths = ["lib"]
 
-    spec.add_dependency "sequel", '~> 4'
+    spec.add_dependency "sequel", '~> 5'
     if defined? JRUBY_VERSION
         spec.add_dependency 'jdbc-sqlite3', '~> 3.8'
     else

data/lib/engine2/action.rb

@@ -54,9 +54,9 @@ module Engine2
         def invoke! handler
             if rmp = @request_action_proc
                 action = self.class.new(node, assets, self)
-                action_result = action.instance_exec(handler, *action.request_action_proc_params(handler), &rmp)
+                result = action.instance_exec(handler, *action.request_action_proc_params(handler), &rmp)
                 action.post_process
-                response = @requestable ? (action_result || {}) : action.invoke(handler)
+                response = @requestable ? (result || {}) : action.invoke(handler)
                 response[:meta] = action.meta
                 response
             else
@@ -72,8 +72,8 @@ module Engine2
             @meta[:arguments] = args
         end
 
-        def execute time
-            @meta[:execute] = time
+        def execute command
+            (@meta[:execute] ||= []) << command
         end
 
         def dynamic?
@@ -189,11 +189,12 @@ module Engine2
                 @ws_methods.each do |method, blk|
                     ws.on(method) do |evt|
                         begin
-                            if method == :message
-                                blk.(JSON.parse(evt.data, symbolize_names: true), ws, evt)
-                            else
-                                blk.(evt, ws, evt)
-                            end
+                            data = method == :message ? JSON.parse(evt.data, symbolize_names: true) : evt
+                            action = self.class.new(node, assets, self)
+                            result = action.instance_exec(data, ws, evt, &blk)
+                            result = {} unless result.is_a?(Hash)
+                            result[:meta] = action.meta
+                            ws.send! result unless action.meta.empty?
                         rescue Exception => e
                             ws.send! error: {exception: e, method: method}
                         end
@@ -222,18 +223,18 @@ module Engine2
     end
 
     module ActionAPISupport
-        def info field
-            (@meta[:info] ||= {})[field.to_sym] ||= {}
+        def fields field
+            (@meta[:fields] ||= {})[field.to_sym] ||= {}
         end
 
         def config
             @meta[:config] ||= {}
         end
 
-        def info! *fields, options
+        def fields! *fields, options
             raise E2Error.new("No fields given to info") if fields.empty?
             fields.each do |field|
-                info(field).merge! options # rmerge ?
+                fields(field).merge! options # rmerge ?
             end
         end
 
@@ -243,24 +244,24 @@ module Engine2
 
         def decorate list
             list.each do |f|
-                info(f)[:loc] ||= LOCS[f.to_sym]
+                fields(f)[:loc] ||= LOCS[f.to_sym]
             end
         end
 
         def render field, options
-            info! field, render: options
+            fields! field, render: options
         end
 
         def hide_fields *flds
-            info! *flds, hidden: true
+            fields! *flds, hidden: true
         end
 
         def show_fields *flds
-            info! *flds, hidden: false
+            fields! *flds, hidden: false
         end
 
         def field_filter *flds, filter
-            info! *flds, filter: filter
+            fields! *flds, filter: filter
         end
     end
 
@@ -321,23 +322,6 @@ module Engine2
             show_fields *assets[:model].primary_keys
         end
 
-        def get_type_info name
-            model = assets[:model]
-            info = case name
-            when Symbol
-                model.type_info[name]
-            when Sequel::SQL::QualifiedIdentifier
-                assoc = model.many_to_one_associations[name.table] || model.many_to_many_associations[name.table]
-                raise E2Error.new("Association #{name.table} not found for model #{model}") unless assoc
-                assoc.associated_class.type_info[name.column]
-            else
-                raise E2Error.new("Unknown type info key: #{name} in model #{model}")
-            end
-
-            raise E2Error.new("Type info not found for '#{name}' in model '#{model}'") unless info
-            info
-        end
-
         # def parent_model_name
         #     model = @assets[:model]
         #     prnt = node.parent
@@ -431,13 +415,13 @@ module Engine2
         end
 
         def find_record handler, id
-            get_query[assets[:model].primary_keys_hash_qualified(split_keys(id))]
+            get_query.load assets[:model].primary_keys_hash_qualified(split_keys(id))
         end
 
         def select *args, use_pk: true, &blk
             ds = assets[:model].select(*args, &blk)
             ds = ds.ensure_primary_key if use_pk
-            ds.setup!(@meta[:fields] = [])
+            ds.setup_query(@meta[:field_list] = [])
         end
     end
 
@@ -448,15 +432,15 @@ module Engine2
         end
 
         def field_tabs hash
-            @meta[:tabs] = hash.map{|k, v| {name: k, loc: LOCS[k], fields: v} }
+            @meta[:tab_list] = hash.keys
+            @meta[:tabs] = hash.reduce({}){|h, (k, v)| h[k] = {name: k, loc: LOCS[k], field_list: v}; h}
         end
 
-        def lazy_tab tab_name
-           tabs = @meta[:tabs]
-           raise E2Error.new("No tabs defined") unless tabs
-           tab = tabs.find{|t| t[:name] == tab_name}
-           raise E2Error.new("No tab #{tab_name} defined") unless tab
-           tab[:lazy] = true
+        def tab *tabs, options
+            raise E2Error.new("No tabs given to info") if tabs.empty?
+            tabs.each do |tab|
+                @meta[:tabs][tab].merge! options # rmerge ?
+            end
         end
     end
 
@@ -484,7 +468,7 @@ module Engine2
 
         def ng_info! name, *selector, expression
             # expression = "'#{expression}'" if expression.is_a? String
-            "action.meta.info['#{name}'].#{selector.join('.')} = #{expression}"
+            "action.meta.fields['#{name}'].#{selector.join('.')} = #{expression}"
         end
 
         def ng_call name, *args
@@ -542,6 +526,17 @@ module Engine2
         end
     end
 
+    module ActionDraggableSupport
+        def draggable
+            @meta[:draggable] ||= {}
+        end
+
+        def post_run
+            super
+            draggable[:position_field] ||= 'position' if @meta[:draggable]
+        end
+    end
+
     class MenuAction < Action
         include ActionMenuSupport
         action_type :menu
@@ -583,8 +578,8 @@ module Engine2
             nd = node.define_node node_name, (blk.arity > 2 ? OnChangeGetAction : OnChangePostAction)
             nd.*{request &blk}
 
-            info! field, remote_onchange: node_name
-            info! field, remote_onchange_record: :true if blk.arity > 2
+            fields! field, remote_onchange: node_name
+            fields! field, remote_onchange_record: :true if blk.arity > 2
         end
 
         class OnChangeAction < Action
@@ -626,7 +621,7 @@ module Engine2
     end
 
     module ActionListSupport
-        include ActionModelSupport, ActionAPISupport, ActionTabSupport, ActionPanelSupport, ActionMenuSupport, ActionOnChangeSupport
+        include ActionModelSupport, ActionAPISupport, ActionTabSupport, ActionPanelSupport, ActionMenuSupport, ActionOnChangeSupport, ActionDraggableSupport
         attr_reader :filters, :orders
 
         def pre_run
@@ -638,7 +633,7 @@ module Engine2
             loc! LOCS[:list_locs]
             menu :menu do
                 properties break: 2, group_class: "btn-group-xs"
-                option :search_toggle, icon: "search", show: "action.meta.search_fields", active: "action.ui_state.search_active", button_loc: false
+                option :search_toggle, icon: "search", show: "action.meta.search_field_list", active: "action.ui_state.search_active", button_loc: false
                 # divider
                 option :refresh, icon: "refresh", button_loc: false
                 option :default_order, icon: "signal", button_loc: false
@@ -669,7 +664,7 @@ module Engine2
 
         def post_run
             unless panel[:class]
-                panel_class case @meta[:fields].size
+                panel_class case @meta[:field_list].size
                 when 1..3; ''
                 when 4..6; 'modal-large'
                 else; 'modal-huge'
@@ -687,21 +682,22 @@ module Engine2
         # end
 
         def post_process
-            if fields = @meta[:search_fields]
-                fields = fields - static.meta[:search_fields] if dynamic?
+            model = assets[:model]
+            if fields = @meta[:search_field_list]
+                fields = fields - static.meta[:search_field_list] if dynamic?
 
                 decorate(fields)
                 fields.each do |name|
-                    type_info = get_type_info(name)
+                    type_info = model.find_type_info(name)
 
-                    # render = info[name][:render]
+                    # render = fields[name][:render]
                     # if not render
-                    #     info[name][:render] = find_renderer(type_info)
+                    #     fields[name][:render] = find_renderer(type_info)
                     # else
-                    #     info[name][:render].merge!(find_renderer(type_info)){|key, v1, v2|v1}
+                    #     fields[name][:render].merge!(find_renderer(type_info)){|key, v1, v2|v1}
                     # end
 
-                    info(name)[:render] ||= begin # set before :fields
+                    fields(name)[:render] ||= begin # set before :field_list
                         renderer = DefaultSearchRenderers[type_info[:type]] || DefaultSearchRenderers[type_info[:otype]]
                         raise E2Error.new("No search renderer found for field '#{type_info[:name]}'") unless renderer
                         renderer.(self, type_info)
@@ -712,12 +708,12 @@ module Engine2
                 end
             end
 
-            if fields = @meta[:fields]
-                fields = fields - static.meta[:fields] if dynamic?
+            if fields = @meta[:field_list]
+                fields = fields - static.meta[:field_list] if dynamic?
 
                 decorate(fields)
                 fields.each do |name|
-                    type_info = get_type_info(name)
+                    type_info = model.find_type_info(name)
                     proc = ListRendererPostProcessors[type_info[:type]]
                     proc.(self, name, type_info) if proc
                 end
@@ -731,19 +727,20 @@ module Engine2
         end
 
         def sortable *flds
-            flds = @meta[:fields] if flds.empty?
-            info! *flds, sort: true
+            flds = @meta[:field_list] if flds.empty?
+            fields! *flds, sort: true
         end
 
         def search_live *flds
-            flds = @meta[:search_fields] if flds.empty?
-            info! *flds, search_live: true
+            flds = @meta[:search_field_list] if flds.empty?
+            fields! *flds, search_live: true
         end
 
         def searchable *flds
+            @meta.delete(:tab_list)
             @meta.delete(:tabs)
             search_template 'scaffold/search'
-            @meta[:search_fields] = *flds
+            @meta[:search_field_list] = *flds
         end
 
         def searchable_tabs tabs
@@ -760,8 +757,8 @@ module Engine2
         end
 
         def filter_case_insensitive name
-            raise E2Error.new("Field '#{name}' needs to be a string one") unless get_type_info(name)[:otype] == :string
-            filter(name){|query, hash, handler| query.where(name.ilike("%#{hash[name]}%")) }
+            raise E2Error.new("Field '#{name}' needs to be a string one") unless assets[:model].find_type_info(name)[:otype] == :string
+            filter(name){|handler, query, hash| query.where(name.ilike("%#{hash[name]}%")) }
         end
 
         def order name, &blk
@@ -794,7 +791,7 @@ module Engine2
         def validate_and_approve handler, record, parent_id
             static.before_approve(handler, record)
             record.valid?
-            validate_record(handler, record)
+            validate_record(handler, record, parent_id)
             if record.errors.empty?
                 static.after_approve(handler, record)
                 true
@@ -828,10 +825,10 @@ module Engine2
             (@validations ||= {})[name] = blk
         end
 
-        def validate_record handler, record
+        def validate_record handler, record, parent_id
             @validations.each do |name, val|
                 unless record.errors[name]
-                    result = val.(record, handler)
+                    result = val.(handler, record, parent_id)
                     record.errors.add(name, result) if result
                 end
             end if @validations
@@ -844,7 +841,7 @@ module Engine2
 
         def post_run
             super
-            validate_fields *node.parent.*.meta[:fields] unless validate_fields
+            validate_fields *node.parent.*.meta[:field_list] unless validate_fields
         end
     end
 
@@ -859,7 +856,7 @@ module Engine2
         end
 
         def validate_and_approve handler, record, parent_id, validate_only = self.class.validate_only
-            if validate_only then
+            if validate_only
                 super(handler, record, parent_id)
             else
                 record.skip_save_refresh = true
@@ -868,7 +865,7 @@ module Engine2
                 assoc = assets[:assoc]
                 new_assoc = record.new? && assoc && assoc[:type]
 
-                save = lambda do|c|
+                save = lambda do |c|
                     if super(handler, record, parent_id)
                         if new_assoc == :one_to_many
                             handler.permit parent_id
@@ -965,16 +962,16 @@ module Engine2
         end
 
         def post_process
-            if fields = @meta[:fields]
-                fields = fields - static.meta[:fields] if dynamic?
+            if fields = @meta[:field_list]
+                model = assets[:model]
+                fields = fields - static.meta[:field_list] if dynamic?
 
                 decorate(fields)
 
                 fields.each do |name|
-                    # type_info = model.type_info.fetch(name)
-                    type_info = get_type_info(name)
+                    type_info = model.find_type_info(name)
 
-                    info(name)[:render] ||= begin
+                    fields(name)[:render] ||= begin
                         renderer = DefaultFormRenderers[type_info[:type]] # .merge(default: true)
                         raise E2Error.new("No form renderer found for field '#{type_info[:name]}' of type '#{type_info[:type]}'") unless renderer
                         renderer.(self, type_info)
@@ -987,11 +984,11 @@ module Engine2
                 assoc = assets[:assoc]
                 if assoc && assoc[:type] == :one_to_many
                     # fields.select{|f| assoc[:keys].include? f}.each do |key|
-                    #     # hide_fields(key) if self[:info, key, :hidden] == nil
-                    #     info! key, disabled: true
+                    #     # hide_fields(key) if self[:fields, key, :hidden] == nil
+                    #     fields! key, disabled: true
                     # end
                     assoc[:keys].each do |key|
-                        info! key, disabled: true if fields.include? key
+                        fields! key, disabled: true if fields.include? key
                     end
                 end
             end
@@ -1009,7 +1006,7 @@ module Engine2
         end
 
         def hr_after field, message = '-'
-            info! field, hr: message
+            fields! field, hr: message
         end
     end
 
@@ -1022,8 +1019,8 @@ module Engine2
 
         def pre_run
             super
-            panel_title LOCS[:create_title]
-            node.parent.*.menu(:menu).option_at 0, node.name, icon: "plus-sign", button_loc: false
+            panel_title "#{LOCS[:create_title]} - #{LOCS[assets[:model].table_name]}"
+            node.parent.*.menu(:menu).option_at 0, node.name, icon: "plus-sign", button_loc: false if node.parent.*.is_a?(ListAction)
 
             hide_pk unless assets[:model].natural_key
         end
@@ -1058,7 +1055,7 @@ module Engine2
 
         def pre_run
             super
-            panel_title LOCS[:modify_title]
+            panel_title "#{LOCS[:modify_title]} - #{LOCS[assets[:model].table_name]}"
             node.parent.*.menu(:item_menu).option node.name, icon: "pencil", button_loc: false
         end
 
@@ -1084,7 +1081,7 @@ module Engine2
         def post_run
             super
             assets[:model].primary_keys.each do |key| # pre_run ?
-                info! key, disabled: true
+                fields! key, disabled: true
             end
         end
     end
@@ -1099,7 +1096,7 @@ module Engine2
         def pre_run
             super
             panel_template 'scaffold/view'
-            panel_title LOCS[:view_title]
+            panel_title "#{LOCS[:view_title]} - #{LOCS[assets[:model].table_name]}"
             panel[:backdrop] = true
 
             menu(:panel_menu).option :cancel, icon: "remove"
@@ -1126,12 +1123,13 @@ module Engine2
         end
 
         def post_process
-            if fields = @meta[:fields]
-                fields = fields - static.meta[:fields] if dynamic?
+            if fields = @meta[:field_list]
+                model = assets[:model]
+                fields = fields - static.meta[:field_list] if dynamic?
 
                 decorate(fields)
                 fields.each do |name|
-                    type_info = get_type_info(name)
+                    type_info = model.find_type_info(name)
                     proc = ListRendererPostProcessors[type_info[:type]]
                     proc.(self, name, type_info) if proc
                 end
@@ -1174,87 +1172,92 @@ module Engine2
 
     (FormRendererPostProcessors ||= {}).merge!(
         boolean: lambda{|action, field, info|
-            action.info(field)[:render].merge! true_value: info[:true_value], false_value: info[:false_value]
-            action.info(field)[:dont_strip] = info[:dont_strip] if info[:dont_strip]
+            action.fields(field)[:render].merge! true_value: info[:true_value], false_value: info[:false_value]
+            action.fields(field)[:dont_strip] = info[:dont_strip] if info[:dont_strip]
         },
         date: lambda{|action, field, info|
-            action.info(field)[:render].merge! format: info[:format], model_format: info[:model_format]
+            action.fields(field)[:render].merge! format: info[:format], model_format: info[:model_format]
             if date_to = info[:other_date]
-                action.info(field)[:render].merge! other_date: date_to #, format: info[:format], model_format: info[:model_format]
+                action.fields(field)[:render].merge! other_date: date_to #, format: info[:format], model_format: info[:model_format]
                 action.hide_fields date_to
             elsif time = info[:other_time]
-                action.info(field)[:render].merge! other_time: time
+                action.fields(field)[:render].merge! other_time: time
                 action.hide_fields time
             end
         },
         time: lambda{|action, field, info|
-            action.info(field)[:render].merge! format: info[:format], model_format: info[:model_format]
+            render = action.fields(field)[:render]
+            render[:type] ||= info[:otype] == :string ? :string : :number
+            render.merge! format: info[:format], model_format: info[:model_format]
         },
         decimal_date: lambda{|action, field, info|
             FormRendererPostProcessors[:date].(action, field, info)
-            action.info! field, type: :decimal_date
+            action.fields! field, type: :decimal_date
         },
         decimal_time: lambda{|action, field, info|
             FormRendererPostProcessors[:time].(action, field, info)
-            action.info! field, type: :decimal_time
+            action.fields! field, type: :decimal_time
         },
         datetime: lambda{|action, field, info|
-            action.info(field)[:render].merge! date_format: info[:date_format], time_format: info[:time_format], date_model_format: info[:date_model_format], time_model_format: info[:time_model_format]
+            action.fields(field)[:render].merge! date_format: info[:date_format], time_format: info[:time_format], date_model_format: info[:date_model_format], time_model_format: info[:time_model_format]
         },
         currency: lambda{|action, field, info|
-            action.info(field)[:render].merge! symbol: info[:symbol]
+            action.fields(field)[:render].merge! symbol: info[:symbol]
         },
         # date_range: lambda{|action, field, info|
-        #     action.info[field][:render].merge! other_date: info[:other_date], format: info[:format], model_format: info[:model_format]
+        #     action.fields[field][:render].merge! other_date: info[:other_date], format: info[:format], model_format: info[:model_format]
         #     action.hide_fields info[:other_date]
-        #     action.info[field][:decimal_date] = true if info[:validations][:decimal_date]
+        #     action.fields[field][:decimal_date] = true if info[:validations][:decimal_date]
         # },
         list_select: lambda{|action, field, info|
-            action.info(field)[:render].merge! list: info[:list]
+            render = action.fields(field)[:render]
+            render.merge! values: info[:values]
+            render.merge! max_length: info[:max_length], max_length_html: info[:max_length_html], separator: info[:separator] if info[:multiselect]
         },
         many_to_one: lambda{|action, field, info|
-            field_info = action.info(field)
+            field_info = action.fields(field)
             field_info[:assoc] = :"#{info[:assoc_name]}!"
             field_info[:fields] = info[:keys]
             field_info[:type] = info[:otype]
 
             (info[:keys] - [field]).each do |of|
-                f_info = action.info(of)
+                f_info = action.fields(of)
                 f_info[:hidden] = true
                 f_info[:type] = action.assets[:model].type_info[of].fetch(:otype)
             end
         },
         file_store: lambda{|action, field, info|
-            action.info(field)[:render].merge! multiple: info[:multiple]
+            action.fields(field)[:render].merge! multiple: info[:multiple]
         },
         star_to_many_field: lambda{|action, field, info|
-            field_info = action.info(field)
+            field_info = action.fields(field)
             field_info[:assoc] = :"#{info[:assoc_name]}!"
         }
     )
 
     (ListRendererPostProcessors ||= {}).merge!(
         boolean: lambda{|action, field, info|
-            action.info! field, type: :boolean # move to action ?
-            action.info(field)[:render] ||= {}
-            action.info(field)[:render].merge! true_value: info[:true_value], false_value: info[:false_value]
+            action.fields! field, type: :boolean # move to action ?
+            action.fields(field)[:render] ||= {}
+            action.fields(field)[:render].merge! true_value: info[:true_value], false_value: info[:false_value]
         },
         list_select: lambda{|action, field, info|
-            action.info! field, type: :list_select
-            action.info(field)[:render] ||= {}
-            action.info(field)[:render].merge! list: info[:list]
+            action.fields! field, type: :list_select
+            render = (action.fields(field)[:render] ||= {})
+            render.merge! values: info[:values]
+            render.merge! multiselect: true if info[:multiselect]
         },
         datetime: lambda{|action, field, info|
-            action.info! field, type: :datetime
+            action.fields! field, type: :datetime
         },
         decimal_date: lambda{|action, field, info|
-            action.info! field, type: :decimal_date
+            action.fields! field, type: :decimal_date
         },
         decimal_time: lambda{|action, field, info|
-            action.info! field, type: :decimal_time
+            action.fields! field, type: :decimal_time
         },
         # date_range: lambda{|action, field, info|
-        #     action.info[field][:type] = :decimal_date if info[:validations][:decimal_date] # ? :decimal_date : :date
+        #     action.fields[field][:type] = :decimal_date if info[:validations][:decimal_date] # ? :decimal_date : :date
         # }
     )
 
@@ -1269,21 +1272,21 @@ module Engine2
                 keys = info[:keys].map{|k| model.table_name.q(k)}
             end
 
-            field_info = action.info(field)
+            field_info = action.fields(field)
             field_info[:assoc] = :"#{info[:assoc_name]}!"
             field_info[:fields] = keys
             field_info[:type] = info[:otype]
 
             (keys - [field]).each do |of|
-                f_info = action.info(of)
+                f_info = action.fields(of)
                 raise E2Error.new("Missing searchable field: '#{of}' in model '#{action.assets[:model]}'") unless f_info
                 f_info[:hidden_search] = true
                 f_info[:type] = model.type_info[of].fetch(:otype)
             end
         },
         date: lambda{|action, field, info|
-            action.info(field)[:render] ||= {}
-            action.info(field)[:render].merge! format: info[:format], model_format: info[:model_format] # Model::DEFAULT_DATE_FORMAT
+            action.fields(field)[:render] ||= {}
+            action.fields(field)[:render].merge! format: info[:format], model_format: info[:model_format] # Model::DEFAULT_DATE_FORMAT
         },
         decimal_date: lambda{|action, field, info|
             SearchRendererPostProcessors[:date].(action, field, info)
@@ -1313,14 +1316,15 @@ module Engine2
         boolean: lambda{|action, info| Templates.checkbox_buttons(optional: !info[:required])},
         currency: lambda{|action, info| Templates.currency},
         list_select: lambda{|action, info|
-            length = info[:list].length
-            if length <= 3
+            length = info[:values].length
+            max_length = info[:values].map(&:last).max_by(&:length).length
+            if info[:multiselect]
+                Templates.list_bsmselect(max_length)
+            elsif length <= 3
                 Templates.list_buttons(optional: !info[:required])
             elsif length <= 15
-                max_length = info[:list].max_by{|a|a.last.length}.last.length
                 Templates.list_bsselect(max_length, optional: !info[:required])
             else
-                max_length = info[:list].max_by{|a|a.last.length}.last.length
                 Templates.list_select(max_length, optional: !info[:required])
             end
         },
@@ -1344,7 +1348,7 @@ module Engine2
         string: lambda{|action, info| SearchTemplates.input_text},
         boolean: lambda{|action, info| SearchTemplates.checkbox_buttons},
         list_select: lambda{|action, info|
-            length = info[:list].length
+            length = info[:values].length
             if length <= 3
                 SearchTemplates.list_buttons
             elsif length <= 15