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

Revert 396a47b6af

Browse source
This commit is contained in:
Julius 2013-02-25 10:13:44 +01:00
parent ccf0d010b4
commit 8f15cfb446
10 changed files with 30 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/stockit_controller.rb
View file

@ -1,7 +1,8 @@
class StockitController < ApplicationController
def index
@stock_articles = StockArticle.elements_for_index
@stock_articles = StockArticle.includes(:supplier, :article_category).
order('suppliers.name, article_categories.name, articles.name')
@stock_article_selection = StockArticleSelection.new
end

29
app/controllers/stockit_selections_controller.rb
View file

@ -2,7 +2,7 @@
class StockitSelectionsController < ApplicationController
def index
@stock_article_selections = StockArticleSelection.find(:all, :order => 'created_at DESC')
@stock_article_selections = StockArticleSelection.all
end
def show
@ -14,48 +14,43 @@ class StockitSelectionsController < ApplicationController
@stock_article_selection.created_by = current_user
if @stock_article_selection.save
redirect_to(@stock_article_selection, :notice => 'Löschvorschlag für gewählte Artikel erstellt.')
redirect_to(@stock_article_selection, :notice => 'Löschvorschlag für gewählte Artikel wurde erstellt.')
else
@stock_articles = StockArticle.elements_for_index
@stock_articles = StockArticle.includes(:supplier, :article_category).
order('suppliers.name, article_categories.name, articles.name')
render 'stockit/index'
end
end
def destroy # destroy selection without deleting articles
def destroy # destroy (open or finished) selection without deleting articles
stock_article_selection = StockArticleSelection.find(params[:id])
stock_article_selection.destroy
redirect_to stock_article_selections_path, :notice => 'Löschvorschlag verworfen.'
redirect_to stock_article_selections_path, :notice => 'Löschvorschlag wurde verworfen.'
end
def articles # destroy articles
def articles # destroy articles, finish selection
stock_article_selection = StockArticleSelection.find(params[:id])
destroyed_articles_count = 0
failed_articles_count = 0
stock_article_selection.stock_articles.each do |article|
begin
article.destroy
article.destroy # article.delete would save some effort, but validations are important
destroyed_articles_count += 1
rescue => error # recover if article.destroy fails and continue with next article
failed_articles_count += 1
end
end
if destroyed_articles_count > 0
flash[:notice] = "#{destroyed_articles_count} gewählte Artikel gelöscht."
if destroyed_articles_count>0 # note that 1 successful article.destroy is enough to destroy selection
stock_article_selection.destroy
flash[:notice] = "#{destroyed_articles_count} gewählte Artikel sind nun gelöscht."
flash[:error] = "#{failed_articles_count} Artikel konnten nicht gelöscht werden." unless 0==failed_articles_count
else
flash[:error] = 'Löschvorgang fehlgeschlagen. Keine Artikel gelöscht.'
flash[:error] = "Löschvorgang fehlgeschlagen. Es wurden keine Artikel gelöscht."
end
redirect_to stock_articles_path
end
def finished # delete all finished selections
finished_selections = StockArticleSelection.all.select { |sel| sel.deletable_count + sel.nondeletable_count <= 0 }
finished_selections.each { |sel| sel.destroy }
redirect_to stock_article_selections_path, :notice => 'Alle erledigten Löschvorschläge entfernt.'
end
end