Download as
Browse Code »

Commit 7e7227c04e934c91e3d3e5b342ad9aa575e7634b

Authored by Rodrigo Souto
1 parent 79485323
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[bsc-contract] Fixing sql query and interface 

  * Postgres doesn't accept emtpy string or null value in the in clause
    so i'm changing the empty value for -1, as there is no negative id.
  * Adjusting sizes of inputs

(ActionItem2079)
Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb
  Diff comments   View file @7e7227c
... ... @@ -196,9 +196,9 @@ class BscPluginMyprofileController < MyProfileController
196 196 def search_sale_product
197 197 query = params[:sales].map {|key, value| value}[0][:product_id]
198 198 enterprises = (params[:enterprises] || []).split(',')
199   - enterprises = enterprises.blank? ? '' : enterprises
  199 + enterprises = enterprises.blank? ? -1 : enterprises
200 200 added_products = (params[:added_products] || []).split(',')
201   - added_products = added_products.blank? ? '' : added_products
  201 + added_products = added_products.blank? ? -1 : added_products
202 202 render :text => Product.find(:all, :conditions => ["LOWER(name) LIKE ? AND enterprise_id IN (?) AND id NOT IN (?)", "%#{query}%", enterprises, added_products]).
203 203 map {|product| { :id => product.id,
204 204 :name => short_text(product_display_name(product), 60),
... ...
plugins/bsc/public/contracts.js
  Diff comments   View file @7e7227c
... ... @@ -47,7 +47,7 @@ var BSCContracts = {};
47 47 input.keydown(function(event){ if(event.keyCode == '13') return false })
48 48 .tokenInput(searchUrl, opts);
49 49 $('#bsc-plugin-contract-total-row').before(tr);
50   - $('<input id="bsc-plugin-sale-'+id+'-quantity" class="bsc-plugin-sales-quantity '+required+' digits" name="sales['+id+'][quantity]" align="center" size="7" value="'+quantity+'"/>').appendTo(tds[1]);
  50 + $('<input id="bsc-plugin-sale-'+id+'-quantity" class="bsc-plugin-sales-quantity '+required+' digits" name="sales['+id+'][quantity]" align="center" size="8" value="'+quantity+'"/>').appendTo(tds[1]);
51 51 $('<input id="bsc-plugin-sale-'+id+'-price" class="bsc-plugin-sales-price '+required+' number" name="sales['+id+'][price]" value="'+price+'"/>').appendTo(tds[2]);
52 52 };
53 53  
... ...
plugins/bsc/public/style.css
  Diff comments   View file @7e7227c
... ... @@ -73,7 +73,7 @@
73 73 }
74 74  
75 75 .bsc-plugin-sales-price {
76   - width: 85%;
  76 + width: 75%;
77 77 }
78 78  
79 79 .bsc-plugin-sales-products-column {
... ...