show error flash on failed file stuffs

ZeusWPI · Feb 4, 2016 · 670b176 · 670b176
1 parent 9c31d9d
commit 670b176
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -5,17 +5,15 @@ class UsersController < ApplicationController
   def show
   end
 
-  def edit
-  end
-
   def update
     if @user.update_attributes(user_params)
       flash[:success] = "Successfully updated!"
-      redirect_to @user
     else
+      flash[:error] = "Update failed!"
+      # TODO form errors?
       @user.reload
-      render 'edit'
     end
+    redirect_to @user
   end
 
   def edit_dagschotel
@@ -38,7 +36,7 @@ def quickpay
   private
 
     def user_params
-      params.require(:user).permit(:avatar, :private, :dagschotel_id)
+      params.fetch(:user, {}).permit(:avatar, :private, :dagschotel_id)
     end
 
     def init

diff --git a/config/routes.rb b/config/routes.rb
@@ -17,7 +17,7 @@
     end
   end
 
-  resources :users, only: [:show] do
+  resources :users, only: [:show, :update] do
     resources :orders, only: [:new, :create, :destroy]
     member do
       get 'quickpay'               => 'users#quickpay'