Refactoring of order comments.
This commit is contained in:
parent
38b5dcba1f
commit
88b268cb0b
14 changed files with 57 additions and 47 deletions
16
app/controllers/order_comments_controller.rb
Normal file
16
app/controllers/order_comments_controller.rb
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
class OrderCommentsController < ApplicationController
|
||||
|
||||
def new
|
||||
@order = Order.find(params[:order_id])
|
||||
@order_comment = @order.comments.build(:user => current_user)
|
||||
end
|
||||
|
||||
def create
|
||||
@order_comment = OrderComment.new(params[:order_comment])
|
||||
if @order_comment.save
|
||||
render :layout => false
|
||||
else
|
||||
render :action => :new, :layout => false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -64,19 +64,6 @@ class OrderingController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# adds a Comment to the Order
|
||||
def add_comment
|
||||
order = Order.find(params[:id])
|
||||
comment = order.comments.build(params[:comment])
|
||||
comment.user = @current_user
|
||||
if !comment.text.blank? and comment.save
|
||||
flash[:notice] = "Kommentar wurde erstellt."
|
||||
else
|
||||
flash[:error] = "Kommentar konnte nicht erstellt werden. Leerer Kommentar?"
|
||||
end
|
||||
redirect_to :action => 'show', :id => order
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# Returns true if @current_user is member of an Ordergroup.
|
||||
|
|
|
|||
|
|
@ -159,17 +159,4 @@ class OrdersController < ApplicationController
|
|||
redirect_to @order
|
||||
end
|
||||
end
|
||||
|
||||
# adds a Comment to the Order
|
||||
def add_comment
|
||||
order = Order.find(params[:id])
|
||||
comment = order.comments.build(params[:comment])
|
||||
comment.user = @current_user
|
||||
if !comment.text.empty? and comment.save
|
||||
flash[:notice] = "Kommentar wurde erstellt."
|
||||
else
|
||||
flash[:error] = "Kommentar konnte nicht erstellt werden. Leerer Kommentar?"
|
||||
end
|
||||
redirect_to order
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue