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

Merge branch master into i18n

Browse source
This commit is contained in:
Manuel Wiedenmann 2013-06-14 02:02:57 +02:00
commit 5b7ec86ed6
71 changed files with 5470 additions and 2861 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/workgroups_controller.rb
View file

@ -13,8 +13,8 @@ class Admin::WorkgroupsController < Admin::BaseController
def destroy
@workgroup = Workgroup.find(params[:id])
@workgroup.destroy
redirect_to admin_workgroups_url, notice: t('admin.ordergroups.destroy.notice')
redirect_to admin_workgroups_url, notice: t('admin.workgroups.destroy.notice')
rescue => error
redirect_to admin_workgroups_url, alert: t('admin.ordergroups.destroy.error')
redirect_to admin_workgroups_url, alert: t('admin.workgroups.destroy.error')
end
end

2
app/controllers/suppliers_controller.rb
View file

@ -18,7 +18,7 @@ class SuppliersController < ApplicationController
def new
if params[:shared_supplier_id]
shared_supplier = SharedSupplier.find(params[:shared_supplier_id])
@supplier = shared_supplier.build_supplier(shared_supplier.attributes)
@supplier = shared_supplier.build_supplier(shared_supplier.autofill_attributes)
else
@supplier = Supplier.new
end