Fix new stock article failing

This commit is contained in:
wvengen 2016-05-20 21:30:56 +02:00
parent f9ffa0caff
commit be287cf67e
2 changed files with 20 additions and 21 deletions

View file

@ -4,16 +4,16 @@ class StockitController < ApplicationController
@stock_articles = StockArticle.undeleted.includes(:supplier, :article_category). @stock_articles = StockArticle.undeleted.includes(:supplier, :article_category).
order('suppliers.name, article_categories.name, articles.name') order('suppliers.name, article_categories.name, articles.name')
end end
def index_on_stock_article_create # See publish/subscribe design pattern in /doc. def index_on_stock_article_create # See publish/subscribe design pattern in /doc.
@stock_article = StockArticle.find(params[:id]) @stock_article = StockArticle.find(params[:id])
render :layout => false render :layout => false
end end
def index_on_stock_article_update # See publish/subscribe design pattern in /doc. def index_on_stock_article_update # See publish/subscribe design pattern in /doc.
@stock_article = StockArticle.find(params[:id]) @stock_article = StockArticle.find(params[:id])
render :layout => false render :layout => false
end end
@ -24,43 +24,41 @@ class StockitController < ApplicationController
render :layout => false render :layout => false
end end
# (2) StockArticle as template # (2) StockArticle as template
def copy def copy
@stock_article = StockArticle.find(params[:stock_article_id]).dup @stock_article = StockArticle.find(params[:stock_article_id]).dup
render :layout => false render :layout => false
end end
# (3) non-stock Article as template # (3) non-stock Article as template
def derive def derive
@stock_article = Article.find(params[:old_article_id]).becomes(StockArticle).dup @stock_article = Article.find(params[:old_article_id]).becomes(StockArticle).dup
render :layout => false render :layout => false
end end
def create def create
@stock_article = StockArticle.new(params[:stock_article]) @stock_article = StockArticle.new({quantity: 0}.merge(params[:stock_article]))
if @stock_article.valid? && @stock_article.save @stock_article.save!
render :layout => false render :layout => false
else rescue ActiveRecord::RecordInvalid
render :action => 'new', :layout => false render :action => 'new', :layout => false
end
end end
def edit def edit
@stock_article = StockArticle.find(params[:id]) @stock_article = StockArticle.find(params[:id])
render :layout => false render :layout => false
end end
def update def update
@stock_article = StockArticle.find(params[:id]) @stock_article = StockArticle.find(params[:id])
if @stock_article.update_attributes(params[:stock_article]) @stock_article.update_attributes!(params[:stock_article])
render :layout => false render :layout => false
else rescue ActiveRecord::RecordInvalid
render :action => 'edit', :layout => false render :action => 'edit', :layout => false
end
end end
def show def show
@ -70,7 +68,7 @@ class StockitController < ApplicationController
def show_on_stock_article_update # See publish/subscribe design pattern in /doc. def show_on_stock_article_update # See publish/subscribe design pattern in /doc.
@stock_article = StockArticle.find(params[:id]) @stock_article = StockArticle.find(params[:id])
render :layout => false render :layout => false
end end

View file

@ -5,6 +5,8 @@ class StockArticle < Article
scope :available, -> { undeleted.where('quantity > 0') } scope :available, -> { undeleted.where('quantity > 0') }
validates :quantity, presence: true, numericality: {greater_than_or_equal_to: 0}
before_destroy :check_quantity before_destroy :check_quantity
# Update the quantity of items in stock # Update the quantity of items in stock
@ -46,4 +48,3 @@ class StockArticle < Article
true true
end end
end end