From 8b2b70f8bfec25a4ebb0c43e175266fb56dd603f Mon Sep 17 00:00:00 2001
From: Benjamin Meichsner <benni@posteo.de>
Date: Sat, 26 Jan 2013 16:24:45 +0100
Subject: [PATCH] Fixed saving user for new orders.

---
 app/controllers/orders_controller.rb | 1 +
 app/helpers/application_helper.rb    | 3 ++-
 app/models/order.rb                  | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
index 31baa680..f3ee9167 100644
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@@ -60,6 +60,7 @@ class OrdersController < ApplicationController
   # order_articles will be saved in Order.article_ids=()
   def create
     @order = Order.new(params[:order])
+    @order.created_by = current_user
     if @order.save
       flash[:notice] = "Die Bestellung wurde erstellt."
       redirect_to @order
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 19269cdb..c4689c96 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -142,7 +142,8 @@ module ApplicationHelper
   # offers a link for writing message to user
   # checks for nil (useful for relations)
   def link_to_user_message_if_valid(user)
-    user.nil? ? '??' : ( link_to user.nick, user_message_path(user), :title => 'Nachricht schreiben' )
+    user.nil? ? '??' : link_to(user.nick, new_message_path('message[mail_to]' => user.id),
+                               :title => 'Nachricht schreiben')
   end
 
   def bootstrap_flash
diff --git a/app/models/order.rb b/app/models/order.rb
index 32c25133..6e48756c 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -19,9 +19,6 @@ class Order < ActiveRecord::Base
   validate :starts_before_ends, :include_articles
 
   # Callbacks
-  before_create do |order|
-    order.created_by = User.current_user
-  end
   after_update :update_price_of_group_orders
   after_save :save_order_articles