From 7e7227c04e934c91e3d3e5b342ad9aa575e7634b Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Thu, 10 Nov 2011 13:31:45 -0300 Subject: [PATCH] [bsc-contract] Fixing sql query and interface --- plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb | 4 ++-- plugins/bsc/public/contracts.js | 2 +- plugins/bsc/public/style.css | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb b/plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb index e095900..e51eb74 100644 --- a/plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb +++ b/plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb @@ -196,9 +196,9 @@ class BscPluginMyprofileController < MyProfileController def search_sale_product query = params[:sales].map {|key, value| value}[0][:product_id] enterprises = (params[:enterprises] || []).split(',') - enterprises = enterprises.blank? ? '' : enterprises + enterprises = enterprises.blank? ? -1 : enterprises added_products = (params[:added_products] || []).split(',') - added_products = added_products.blank? ? '' : added_products + added_products = added_products.blank? ? -1 : added_products render :text => Product.find(:all, :conditions => ["LOWER(name) LIKE ? AND enterprise_id IN (?) AND id NOT IN (?)", "%#{query}%", enterprises, added_products]). map {|product| { :id => product.id, :name => short_text(product_display_name(product), 60), diff --git a/plugins/bsc/public/contracts.js b/plugins/bsc/public/contracts.js index f7cd6cb..bf2b1ca 100644 --- a/plugins/bsc/public/contracts.js +++ b/plugins/bsc/public/contracts.js @@ -47,7 +47,7 @@ var BSCContracts = {}; input.keydown(function(event){ if(event.keyCode == '13') return false }) .tokenInput(searchUrl, opts); $('#bsc-plugin-contract-total-row').before(tr); - $('').appendTo(tds[1]); + $('').appendTo(tds[1]); $('').appendTo(tds[2]); }; diff --git a/plugins/bsc/public/style.css b/plugins/bsc/public/style.css index 87da336..604764f 100644 --- a/plugins/bsc/public/style.css +++ b/plugins/bsc/public/style.css @@ -73,7 +73,7 @@ } .bsc-plugin-sales-price { - width: 85%; + width: 75%; } .bsc-plugin-sales-products-column { -- libgit2 0.21.2