Merge branch 'master' into i18n

Conflicts: app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00 · 2013-10-18 12:30:34 +02:00 · 98e7189d31
commit 98e7189d31
parent bfcf35cd34 51e6a7aeb0
24 changed files with 223 additions and 248 deletions
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@ -98,6 +98,8 @@ class OrdersController < ApplicationController
    order = Order.find(params[:id])
    order.finish!(@current_user)
    redirect_to order, notice: I18n.t('orders.finish.notice')
+  rescue => error
+    redirect_to orders_url, alert: I18n.t('errors.general_msg', :msg => error.message)
  end
  
  # Renders the fax-text-file