Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Robert Waltemath 2012-11-13 08:55:50 +01:00
commit c032fdca6e
5 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/articles_controller.rb
View file

@ -268,8 +268,6 @@ class ArticlesController < ApplicationController
conditions << "supplier_id = #{@supplier.shared_supplier.id}"
# check for keywords
conditions << params[:import_query].split(' ').collect { |keyword| "name LIKE '%#{keyword}%'" }.join(' AND ') unless params[:import_query].blank?
# check for selected lists
conditions << "(" + params[:lists].collect {|list| "list = '#{list[0]}'"}.join(" OR ") + ")" if params[:lists]
# check for regional articles
conditions << "origin = 'REG'" if params[:regional]