From 670b17622d3c78c3a92791fa346886c15c7949af Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Thu, 4 Feb 2016 23:47:34 +0100 Subject: [PATCH] show error flash on failed file stuffs --- app/controllers/users_controller.rb | 10 ++++------ config/routes.rb | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 858ce256..4e0ae578 100644 --- 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 index 316ebfbd..e2238882 100644 --- 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'