---
src/app/controllers/settings_controller.rb | 2 +-
src/app/helpers/application_helper.rb | 3 ++-
src/app/views/realms/_form.haml | 4 +---
src/app/views/roles/_form.haml | 2 +-
src/app/views/settings/self_service.haml | 2 +-
src/app/views/users/_form.haml | 6 ++----
6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/app/controllers/settings_controller.rb
b/src/app/controllers/settings_controller.rb
index 10d3cac..d245713 100644
--- a/src/app/controllers/settings_controller.rb
+++ b/src/app/controllers/settings_controller.rb
@@ -29,7 +29,7 @@ class SettingsController < ApplicationController
if key == SELF_SERVICE_DEFAULT_QUOTA
@self_service_default_quota = MetadataObject.lookup(key)
if !(a)self_service_default_quota.update_attributes(params[key])
- flash[:notice] = "Could not update the default quota"
+ flash[:warning] = "Could not update the default quota"
render :self_service
return
end
diff --git a/src/app/helpers/application_helper.rb
b/src/app/helpers/application_helper.rb
index 55de326..930ad49 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -255,7 +255,8 @@ module ApplicationHelper
end
def error_messages_for(obj)
- flash[:error] ||= "" if obj.errors.present?
+ return unless obj and obj.errors.present?
+ flash[:error] ||= ""
obj.errors.each_pair do |attr, error|
#TODO - Need to format this in some sensible way... <ul>?
flash[:error] << "#{attr.to_s.humanize} #{error}"
diff --git a/src/app/views/realms/_form.haml b/src/app/views/realms/_form.haml
index d3812fa..42d879d 100644
--- a/src/app/views/realms/_form.haml
+++ b/src/app/views/realms/_form.haml
@@ -1,6 +1,4 @@
-- if @realm.errors.any?
- - @realm.errors.full_messages.each do |err|
- = err
+- error_messages_for @realm
%fieldset
= form.label :name, 'Realm Name'
= form.text_field :name, :title => 'realm_name', :value => @realm.name,
:class => 'em long'
diff --git a/src/app/views/roles/_form.haml b/src/app/views/roles/_form.haml
index a22b97c..a3192a7 100644
--- a/src/app/views/roles/_form.haml
+++ b/src/app/views/roles/_form.haml
@@ -1,4 +1,4 @@
-= form.error_messages
+- error_messages_for @role
%fieldset
= form.label :name, 'Name'
= form.text_field :name, :class => "em long"
diff --git a/src/app/views/settings/self_service.haml
b/src/app/views/settings/self_service.haml
index c75471e..acabed0 100644
--- a/src/app/views/settings/self_service.haml
+++ b/src/app/views/settings/self_service.haml
@@ -53,7 +53,7 @@
= t('.quota') + ":"
= text_field :self_service_default_quota, :maximum_running_instances, :class
=> 'grid_5'
.grid_2.la (instances)
- = form.error_message_on :maximum_running_instances, 'Maximum Running
Instances '
+ = error_messages_for @self_service_default_quota if @self_service_default_quota
-#%h3 POOLS
-#%fieldset.clearfix
%label.grid_2.alpha Permissions:
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml
index b353cd4..4e4e03d 100644
--- a/src/app/views/users/_form.haml
+++ b/src/app/views/users/_form.haml
@@ -1,6 +1,4 @@
-%ul
- =(a)user.errors.full_messages.each do |msg|
- %li =msg
+- error_messages_for @user
%fieldset
%p
@@ -42,7 +40,7 @@
= quota_form.label :maximum_running_instances, t(:maximum_running_instances)
= quota_form.text_field :maximum_running_instances
(instances)
- = quota_form.error_message_on :maximum_running_instances, 'Maximum Running
Instances '
+ = error_messages_for @user.quota if @user and @user.quota
-if check_privilege(Privilege::MODIFY, User)
%fieldset
--
1.7.6