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

Merge branch 'master' into i18n

Browse source 
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
This commit is contained in:
wvengen 2013-10-09 23:57:43 +02:00
commit 34a4951e28
21 changed files with 382 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/stockit_controller.rb
View file

@ -31,6 +31,11 @@ class StockitController < ApplicationController
end
end
def show
@stock_article = StockArticle.find(params[:id])
@stock_changes = @stock_article.stock_changes.order('stock_changes.created_at DESC')
end
def destroy
@article = StockArticle.find(params[:id])
@article.mark_as_deleted
@ -55,9 +60,4 @@ class StockitController < ApplicationController
render :partial => 'form', :locals => {:stock_article => stock_article}
end
def history
@stock_article = StockArticle.undeleted.find(params[:stock_article_id])
@stock_changes = @stock_article.stock_changes.order('stock_changes.created_at DESC').each {|s| s.readonly!}
end
end