From: martyntaylor mtaylor@redhat.com
--- src/app/controllers/settings_controller.rb | 8 ++++++-- src/app/models/quota.rb | 10 ++++++---- src/app/views/settings/self_service.haml | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/app/controllers/settings_controller.rb b/src/app/controllers/settings_controller.rb index b040f7f..ae20e12 100644 --- a/src/app/controllers/settings_controller.rb +++ b/src/app/controllers/settings_controller.rb @@ -53,8 +53,12 @@ class SettingsController < ApplicationController KEYS.each do |key| if params[key] if key == SELF_SERVICE_DEFAULT_QUOTA - self_service_default_quota = MetadataObject.lookup(key) - self_service_default_quota.update_attributes(params[key]) + @self_service_default_quota = MetadataObject.lookup(key) + if !@self_service_default_quota.update_attributes(params[key]) + flash[:notice] = "Could not update the default quota" + render :self_service + return + end elsif key == SELF_SERVICE_DEFAULT_POOL if Pool.exists?(params[key]) MetadataObject.set(key, Pool.find(params[key])) diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb index 83c20c4..cfc4555 100644 --- a/src/app/models/quota.rb +++ b/src/app/models/quota.rb @@ -28,14 +28,16 @@ class Quota < ActiveRecord::Base validates_numericality_of :maximum_total_instances, :greater_than_or_equal_to => 0, :less_than_or_equal_to => 2147483647, - :integer_only => true, - :allow_nil => true + :only_integer => true, + :allow_nil => true, + :message => "must be a positive whole number less than 2147483647"
validates_numericality_of :maximum_running_instances, :greater_than_or_equal_to => 0, :less_than_or_equal_to => 2147483647, - :integer_only => true, - :allow_nil => true + :only_integer => true, + :allow_nil => true, + :message => "must be a positive whole number less than 2147483647"
QuotaResource = Struct.new(:name, :used, :max, :available, :unit)
diff --git a/src/app/views/settings/self_service.haml b/src/app/views/settings/self_service.haml index c1da0ae..8fd9950 100644 --- a/src/app/views/settings/self_service.haml +++ b/src/app/views/settings/self_service.haml @@ -8,7 +8,6 @@
.grid_13 = error_messages_for @parent_type - = error_messages_for 'self_service_default_quota' %h2 = t('.self_service_default') - form_for @self_service_default_quota, :url => { :action => 'update' } do |form| @@ -53,6 +52,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 ' %h3 POOLS %fieldset.clearfix %label.grid_2.alpha Permissions:
On Oct 26, 2010, at 2:19 PM, mtaylor@redhat.com wrote:
From: martyntaylor mtaylor@redhat.com
src/app/controllers/settings_controller.rb | 8 ++++++-- src/app/models/quota.rb | 10 ++++++---- src/app/views/settings/self_service.haml | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/app/controllers/settings_controller.rb b/src/app/controllers/settings_controller.rb index b040f7f..ae20e12 100644 --- a/src/app/controllers/settings_controller.rb +++ b/src/app/controllers/settings_controller.rb @@ -53,8 +53,12 @@ class SettingsController < ApplicationController KEYS.each do |key| if params[key] if key == SELF_SERVICE_DEFAULT_QUOTA
self_service_default_quota = MetadataObject.lookup(key)self_service_default_quota.update_attributes(params[key])
@self_service_default_quota = MetadataObject.lookup(key)if !@self_service_default_quota.update_attributes(params[key])flash[:notice] = "Could not update the default quota"render :self_servicereturnend elsif key == SELF_SERVICE_DEFAULT_POOL if Pool.exists?(params[key]) MetadataObject.set(key, Pool.find(params[key]))diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb index 83c20c4..cfc4555 100644 --- a/src/app/models/quota.rb +++ b/src/app/models/quota.rb @@ -28,14 +28,16 @@ class Quota < ActiveRecord::Base validates_numericality_of :maximum_total_instances, :greater_than_or_equal_to => 0, :less_than_or_equal_to => 2147483647,
:integer_only => true,:allow_nil => true
:only_integer => true,:allow_nil => true,:message => "must be a positive whole number less than 2147483647"validates_numericality_of :maximum_running_instances, :greater_than_or_equal_to => 0, :less_than_or_equal_to => 2147483647,
:integer_only => true,:allow_nil => true
:only_integer => true,:allow_nil => true,:message => "must be a positive whole number less than 2147483647"QuotaResource = Struct.new(:name, :used, :max, :available, :unit)
diff --git a/src/app/views/settings/self_service.haml b/src/app/views/settings/self_service.haml index c1da0ae..8fd9950 100644 --- a/src/app/views/settings/self_service.haml +++ b/src/app/views/settings/self_service.haml @@ -8,7 +8,6 @@
.grid_13 = error_messages_for @parent_type
- = error_messages_for 'self_service_default_quota' %h2 = t('.self_service_default')
- form_for @self_service_default_quota, :url => { :action => 'update' } do |form|
@@ -53,6 +52,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 '-- 1.7.2.3
deltacloud-devel mailing list deltacloud-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/deltacloud-devel
I miss tests. So lonely. :(
-- Ladislav ;-)
On Tue, 2010-10-26 at 14:56 +0200, Ladislav Martincik wrote:
On Oct 26, 2010, at 2:19 PM, mtaylor@redhat.com wrote:
From: martyntaylor mtaylor@redhat.com
src/app/controllers/settings_controller.rb | 8 ++++++-- src/app/models/quota.rb | 10 ++++++---- src/app/views/settings/self_service.haml | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-)
<snip>
I miss tests. So lonely. :(
-- Ladislav ;-)
Yeah, since this is not a blocker for this week (ie, not a crazy rush out the door), really any patch fixing a bug should have a test that replicates the bug, and then a patch with code to make the test pass.
-j
deltacloud-devel@lists.fedorahosted.org
-
Jason Guiditta -
lmartinc＠redhat.com -
Martyn Taylor