From e3860b913abb42a7be73804d5e29033640ebb102 Mon Sep 17 00:00:00 2001 From: mallowlabs Date: Sat, 18 Jan 2014 23:58:45 +0900 Subject: [PATCH] Fixed: broken design of error message in configuration page refs #167 --- app/controllers/room_controller.rb | 4 ++-- app/views/room/configure.html.haml | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/room_controller.rb b/app/controllers/room_controller.rb index ba44aec89..701057257 100644 --- a/app/controllers/room_controller.rb +++ b/app/controllers/room_controller.rb @@ -48,8 +48,8 @@ def configure when Room expire_fragment [:roominfo, room.id, true] expire_fragment [:roominfo, room.id, false] - when :error_room_not_found then flash[:errors] = t(:error_room_deleted) - when :error_on_save then flash[:errors] = t(:error_on_save) + when :error_room_not_found then flash[:error] = t(:error_room_deleted) + when :error_on_save then flash[:error] = t(:error_on_save) end redirect_to :action => 'configure' diff --git a/app/views/room/configure.html.haml b/app/views/room/configure.html.haml index 47095007d..3bba86a93 100644 --- a/app/views/room/configure.html.haml +++ b/app/views/room/configure.html.haml @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- -- if flash[:errors] - = raw flash[:errors] - .yield = render :partial => "shared/room_info", :locals => { :room => @room, :has_button => false } .configure