Upgraded to rails 3.1.8. Fixed various bugs in wiki.

This commit is contained in:
benni 2012-09-30 21:15:55 +02:00
parent cd91436f7f
commit 29a6cd8b62
106 changed files with 430 additions and 22436 deletions

View file

@ -3,11 +3,11 @@ class Admin::OrdergroupsController < Admin::BaseController
inherit_resources
def index
@ordergroups = Ordergroup.order(:name.asc)
@ordergroups = Ordergroup.order('name ASC')
# if somebody uses the search field:
unless params[:query].blank?
@ordergroups = @ordergroups.where(:name.matches => "%#{params[:query]}%")
@ordergroups = @ordergroups.where('name LIKE ?', "%#{params[:query]}%")
end
@ordergroups = @ordergroups.paginate(:page => params[:page], :per_page => @per_page)

View file

@ -2,7 +2,7 @@ class Admin::UsersController < Admin::BaseController
inherit_resources
def index
@users = User.order(:nick.asc)
@users = User.order('nick ASC')
# if somebody uses the search field:
unless params[:query].blank?

View file

@ -3,9 +3,9 @@ class Admin::WorkgroupsController < Admin::BaseController
inherit_resources
def index
@workgroups = Workgroup.order(:name.asc)
@workgroups = Workgroup.order('name ASC')
# if somebody uses the search field:
@workgroups = @workgroups.where(:name.matches => "%#{params[:query]}%") unless params[:query].blank?
@workgroups = @workgroups.where('name LIKE ?', "%#{params[:query]}%") unless params[:query].blank?
@workgroups = @workgroups.paginate(:page => params[:page], :per_page => @per_page)

View file

@ -21,7 +21,7 @@ class ArticlesController < ApplicationController
end
@articles = @supplier.articles.includes(:article_category).order(sort)
@articles = @articles.where(:name.matches => "%#{params[:query]}%") unless params[:query].nil?
@articles = @articles.where('name LIKE ?', "%#{params[:query]}%") unless params[:query].nil?
@total = @articles.size
@articles = @articles.paginate(:page => params[:page], :per_page => @per_page)

View file

@ -3,7 +3,7 @@ class Finance::BalancingController < ApplicationController
before_filter :authenticate_finance
def index
@financial_transactions = FinancialTransaction.order(:created_on.desc).limit(8)
@financial_transactions = FinancialTransaction.order('created_on DESC').limit(8)
@orders = Order.finished_not_closed
@unpaid_invoices = Invoice.unpaid
end

View file

@ -20,7 +20,7 @@ class Finance::FinancialTransactionsController < ApplicationController
end
@financial_transactions = @ordergroup.financial_transactions.order(sort)
@financial_transactions = @financial_transactions.where(:note.matches => "%#{params[:query]}%") unless params[:query].nil?
@financial_transactions = @financial_transactions.where('note LIKE ?', "%#{params[:query]}%") unless params[:query].nil?
@financial_transactions = @financial_transactions.paginate :page => params[:page], :per_page => 10
@ -39,8 +39,9 @@ class Finance::FinancialTransactionsController < ApplicationController
@financial_transaction.user = current_user
@financial_transaction.add_transaction!
redirect_to finance_ordergroup_transactions_url(@ordergroup), :notice => "Die Transaktion wurde gespeichert."
#rescue
# render :action => :new
rescue ActiveRecord::RecordInvalid => error
flash.now[:alert] = error.message
render :action => :new
end
def new_collection

View file

@ -1,7 +1,7 @@
class Finance::InvoicesController < ApplicationController
def index
@invoices = Invoice.includes(:supplier, :delivery, :order).order(:date.desc).paginate(page: params[:page])
@invoices = Invoice.includes(:supplier, :delivery, :order).order('date DESC').paginate(page: params[:page])
respond_to do |format|
format.html # index.html.erb

View file

@ -14,7 +14,7 @@ class Finance::OrdergroupsController < ApplicationController
end
@ordergroups = Ordergroup.order(sort)
@ordergroups = @ordergroups.where(:name.matches => "%#{params[:query]}%") unless params[:query].nil?
@ordergroups = @ordergroups.where('name LIKE ?', "%#{params[:query]}%") unless params[:query].nil?
@ordergroups = @ordergroups.paginate :page => params[:page], :per_page => @per_page

View file

@ -1,8 +1,8 @@
class Foodcoop::OrdergroupsController < ApplicationController
def index
@ordergroups = Ordergroup.order(:name.desc)
@ordergroups = @ordergroups.where(:name.matches => "%#{params[:query]}%") unless params[:query].blank? # Search by name
@ordergroups = Ordergroup.order('name DESC')
@ordergroups = @ordergroups.where('name LIKE ?', "%#{params[:query]}%") unless params[:query].blank? # Search by name
@ordergroups = @ordergroups.joins(:orders).where(:orders => {:starts.gte => Time.now.months_ago(3)}) if params[:only_active] # Select only active groups
@total = @ordergroups.size

View file

@ -1,7 +1,7 @@
class Foodcoop::UsersController < ApplicationController
def index
@users = User.order(:nick.asc)
@users = User.order('nick ASC')
# if somebody uses the search field:
unless params[:query].blank?

View file

@ -41,7 +41,7 @@ class StockitController < ApplicationController
#TODO: Fix this!!
def articles_search
@articles = Article.not_in_stock.limit(8).where(:name.matches => params[:term])
@articles = Article.not_in_stock.limit(8).where('name LIKE ?', "%#{params[:term]}%")
render :json => @articles.map(&:name)
end