Browse Source

Merge pull request #73 from spacemunkay/denney-min-chars

Denney min chars
topic-sass
Jason Denney 11 years ago
parent
commit
bceac0543a
  1. 2
      app/components/bike_logs.rb
  2. 8
      app/components/bikes.rb
  3. 2
      app/components/transaction_logs.rb
  4. 2
      app/components/user_logs.rb

2
app/components/bike_logs.rb

@ -47,7 +47,7 @@ class BikeLogs < Netzke::Basepack::Grid
{ :name => :start_date}, { :name => :start_date},
{ :name => :description}, { :name => :description},
#had to hack acts_as_loggable/log.rb to get this to work #had to hack acts_as_loggable/log.rb to get this to work
{ :name => :bike_action__action, :field_label => 'Action'} { :name => :bike_action__action, :field_label => 'Action', :min_chars => 1 }
] ]
end end

8
app/components/bikes.rb

@ -41,18 +41,18 @@ class Bikes < Netzke::Basepack::Grid
def default_fields_for_forms def default_fields_for_forms
# :field_label MUST be defined in order for search to work # :field_label MUST be defined in order for search to work
[ [
{ :name => :bike_brand__brand, :field_label => 'Brand' }, { :name => :bike_brand__brand, :field_label => 'Brand', :min_chars => 1 },
{ :name => :model, :field_label => 'Model'}, { :name => :model, :field_label => 'Model'},
{ :name => :shop_id, :field_label => 'Shop ID'}, { :name => :shop_id, :field_label => 'Shop ID'},
{ :name => :serial_number, :field_label => 'Serial Number'}, { :name => :serial_number, :field_label => 'Serial Number'},
{ :name => "color", :xtype => "xcolorcombo"}, { :name => "color", :xtype => "xcolorcombo"},
{ :name => :bike_style__style, :field_label => 'Style' }, { :name => :bike_style__style, :field_label => 'Style', :min_chars => 1},
{ :name => :seat_tube_height, :field_label => 'Seat Tube (in)'}, { :name => :seat_tube_height, :field_label => 'Seat Tube (in)'},
{ :name => :top_tube_length, :field_label => 'Top Tube (in)'}, { :name => :top_tube_length, :field_label => 'Top Tube (in)'},
{ :name => :wheel_size, :field_label => 'Wheel Size (in)'}, { :name => :wheel_size, :field_label => 'Wheel Size (in)'},
{ :name => :value, :field_label => 'Value'}, { :name => :value, :field_label => 'Value'},
{ :name => :bike_condition__condition, :field_label => 'Condition'}, { :name => :bike_condition__condition, :field_label => 'Condition', :min_chars => 1},
{ :name => :bike_purpose__purpose, :field_label => 'Purpose'} { :name => :bike_purpose__purpose, :field_label => 'Purpose', :min_chars => 1}
] ]
end end
#override with nil to remove actions #override with nil to remove actions

2
app/components/transaction_logs.rb

@ -49,7 +49,7 @@ class TransactionLogs < Netzke::Basepack::Grid
{ :no_binding => true, :xtype => 'displayfield', :fieldLabel => "Payment for:", :value => "#{item.to_s}"}, { :no_binding => true, :xtype => 'displayfield', :fieldLabel => "Payment for:", :value => "#{item.to_s}"},
{ :name => :description, :xtype => 'numberfield', :field_label => 'Amount'}, { :name => :description, :xtype => 'numberfield', :field_label => 'Amount'},
#had to hack acts_as_loggable/log.rb to get this to work #had to hack acts_as_loggable/log.rb to get this to work
{ :name => :transaction_action__action, :field_label => 'Payment Method'} { :name => :transaction_action__action, :field_label => 'Payment Method', :min_chars => 1}
] ]
end end

2
app/components/user_logs.rb

@ -63,7 +63,7 @@ class UserLogs < Netzke::Basepack::Grid
{ :name => :end_date}, { :name => :end_date},
{ :name => :description}, { :name => :description},
#had to hack acts_as_loggable/log.rb to get this to work #had to hack acts_as_loggable/log.rb to get this to work
{ :name => :user_action__action, :field_label => 'Action'}, { :name => :user_action__action, :field_label => 'Action', :min_chars => 1},
{ :name => :for_bike, :checkboxName => :copy_log, :inputValue => true, :title => "Copy description to a Bike's History?", :xtype => 'fieldset', :checkboxToggle => true, :collapsed => true, :items => [ { :name => :for_bike, :checkboxName => :copy_log, :inputValue => true, :title => "Copy description to a Bike's History?", :xtype => 'fieldset', :checkboxToggle => true, :collapsed => true, :items => [
{:xtype => 'combo', :no_binding => true, :name => :copy_id, :title => 'Bike', :fieldLabel => 'Bike', :store => bike_store, :value => bike_id} {:xtype => 'combo', :no_binding => true, :name => :copy_id, :title => 'Bike', :fieldLabel => 'Bike', :store => bike_store, :value => bike_id}
] ]

Loading…
Cancel
Save