From: martyntaylor <[email protected]>
---
src/app/controllers/quota_controller.rb | 4 ++--
src/app/models/quota.rb | 9 +++++++--
src/app/views/quota/edit.haml | 5 +----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/app/controllers/quota_controller.rb
b/src/app/controllers/quota_controller.rb
index 0cc1e2f..dfa09a1 100644
--- a/src/app/controllers/quota_controller.rb
+++ b/src/app/controllers/quota_controller.rb
@@ -47,7 +47,8 @@ class QuotaController < ApplicationController
require_privilege(Privilege::QUOTA_MODIFY, @parent)
@quota = @parent.quota
- if @quota.update_attributes(params[:quota])
+ @quota.update_attributes(params[:quota])
+ if @quota.save!
flash[:notice] = "Quota updated!"
redirect_to :action => 'show', :id => @parent, :parent_type =>
@parent_type
else
@@ -98,5 +99,4 @@ class QuotaController < ApplicationController
return params
end
-
end
diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb
index 87e3a7b..ff1c0a8 100644
--- a/src/app/models/quota.rb
+++ b/src/app/models/quota.rb
@@ -61,8 +61,7 @@ class Quota < ActiveRecord::Base
end
def quota_resources()
- quota_resources = {"running_instances" => QuotaResource.new("Running
Instances", running_instances, maximum_running_instances, nil, ""),
- "total_instances" => QuotaResource.new("Total Instances",
total_instances, maximum_total_instances, nil, "")}
+ quota_resources = {"running_instances" => QuotaResource.new("Running
Instances", running_instances, maximum_running_instances, nil, "")}
quota_resources.each_value do |quota_resource|
if Quota.no_limit(quota_resource.max)
@@ -87,4 +86,10 @@ class Quota < ActiveRecord::Base
return false
end
+ protected
+ def validate
+ if maximum_running_instances != nil && !maximum_running_instances.to_i &&
maximum_running_instances < 0
+ errors.add_to_base("or Leave Blank to declare Unlimited")
+ end
+ end
end
diff --git a/src/app/views/quota/edit.haml b/src/app/views/quota/edit.haml
index cb985b9..d51a707 100644
--- a/src/app/views/quota/edit.haml
+++ b/src/app/views/quota/edit.haml
@@ -11,7 +11,4 @@
%li
%label Max Running Instances
= text_field :quota, :maximum_running_instances
- %li
- %label Max Total Instances
- = text_field :quota, :maximum_total_instances
- = submit_tag "Save", :class => "submit"
+ = submit_tag "Save", :class => "submit"
\ No newline at end of file
--
1.7.2.2
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
