This commit is contained in:
Yuki 2015-08-26 00:50:18 +05:30
parent 7c68b2a167
commit 2e0a00e461
2 changed files with 2 additions and 5 deletions

View File

@ -561,6 +561,3 @@ DEPENDENCIES
web-console web-console
will_paginate will_paginate
will_paginate-bootstrap will_paginate-bootstrap
BUNDLED WITH
1.10.6

View File

@ -138,12 +138,12 @@ class UserController < ApplicationController
if current_user.theme.save if current_user.theme.save
flash[:success] = 'Theme saved.' flash[:success] = 'Theme saved.'
else else
flash[:error] = 'Theme saving failed. ' + current_user.theme.errors.messages.values.flatten.join ' ' flash[:error] = 'Theme saving failed. ' + current_user.theme.errors.messages.values.flatten.join(' ')
end end
elsif current_user.theme.update_attributes(update_attributes) elsif current_user.theme.update_attributes(update_attributes)
flash[:success] = 'Theme saved.' flash[:success] = 'Theme saved.'
else else
flash[:error] = 'Theme saving failed. ' + current_user.theme.errors.messages.values.flatten.join ' ' flash[:error] = 'Theme saving failed. ' + current_user.theme.errors.messages.values.flatten.join(' ')
end end
redirect_to edit_user_theme_path redirect_to edit_user_theme_path
end end