lib/netzke/basepack/search_panel.rb in netzke-basepack-0.12.9 vs lib/netzke/basepack/search_panel.rb in netzke-basepack-1.0.0.0.pre

@@ -37,34 +37,32 @@
 
       ATTRIBUTE_OPERATORS_MAP[:datetime] = ATTRIBUTE_OPERATORS_MAP[:date]
       ATTRIBUTE_OPERATORS_MAP[:decimal] = ATTRIBUTE_OPERATORS_MAP[:integer]
       ATTRIBUTE_OPERATORS_MAP[:float] = ATTRIBUTE_OPERATORS_MAP[:integer]
 
-      js_configure do |c|
+      client_class do |c|
         c.extend = "Ext.form.FormPanel"
         c.padding = 5
         c.auto_scroll = true
         c.require :condition_field
-        c.mixin
         c.attribute_operators_map = ATTRIBUTE_OPERATORS_MAP
       end
 
-      def js_configure(c)
+      def configure_client(c)
         super
         c.attrs = config[:fields]
         c.preset_query = (config[:load_last_preset] ? last_preset.try(:fetch, "query") : config[:query]) || []
       end
 
       def attributes
         config[:fields].map do |f|
-          f[:attr_type] ||= :string
-          {name: f[:name], field_label: f[:field_label], attr_type: f[:attr_type]}
+          f[:type] ||= :string
+          {name: f[:name], field_label: f[:field_label], type: f[:type]}
         end
       end
 
       def last_preset
         (state[:presets] || []).last
       end
-
     end
   end
 end