array.rb in engine2-1.0.6

- old
+ new

@@ -43,11 +43,11 @@
             page = params[:page].to_i
             handler.permit page >= 0 && page < 1000
 
             if order_str = params[:order]
                 order = order_str.to_sym
-                handler.permit lookup(:info, order, :sort)
+                handler.permit lookup(:fields, order, :sort)
                 entries = entries.sort_by{|e|e[order].to_s}
                 entries = entries.reverse if params[:asc] == "true"
             end
 
             if search = params[:search]
@@ -58,17 +58,17 @@
         end
 
         def list_search entries, handler, search
             hash = JSON.parse(search, symbolize_names: true) rescue handler.halt_forbidden
             model = assets[:model]
-            sfields = lookup(:search_fields)
+            sfields = lookup(:search_field_list)
             handler.permit sfields
             hash.each_pair do |name, value|
                 handler.permit sfields.include?(name)
 
-                type_info = get_type_info(name)
+                type_info = model.find_type_info(name)
                 entries = if filter = (@filters && @filters[name]) || (dynamic? && (static.filters && static.filters[name]))
-                    filter.(entries, hash, handler)
+                    filter.(handler, entries, hash)
                 elsif filter = DefaultFilters[type_info[:otype]]
                     filter.(entries, name, value, type_info, hash)
                 else
                     raise E2Error.new("Filter not found for field '#{name}' in model '#{model}'") unless filter
                 end
\ No newline at end of file