From: Jozef Zigmund <[email protected]>
---
.../controllers/admin/pool_families_controller.rb | 1 -
src/app/models/pool_family.rb | 1 +
src/app/views/admin/pool_families/_list.haml | 3 +--
3 files changed, 2 insertions(+), 3 deletions(-)
create mode 100644 src/app/views/admin/pool_families/_history.haml
create mode 100644 src/app/views/admin/pool_families/_permissions.haml
create mode 100644 src/app/views/admin/pool_families/_pools.haml
create mode 100644 src/app/views/admin/pool_families/_provider_accounts.haml
diff --git a/src/app/controllers/admin/pool_families_controller.rb
b/src/app/controllers/admin/pool_families_controller.rb
index cfe7025..9fe2c25 100644
--- a/src/app/controllers/admin/pool_families_controller.rb
+++ b/src/app/controllers/admin/pool_families_controller.rb
@@ -70,4 +70,3 @@ class Admin::PoolFamiliesController < ApplicationController
@url_params = params.clone
end
end
-
diff --git a/src/app/models/pool_family.rb b/src/app/models/pool_family.rb
index 6925680..bc96fee 100644
--- a/src/app/models/pool_family.rb
+++ b/src/app/models/pool_family.rb
@@ -27,6 +27,7 @@ class PoolFamily < ActiveRecord::Base
has_and_belongs_to_many :cloud_accounts
validates_presence_of :name
+ validates_uniqueness_of :name
def self.default
MetadataObject.lookup(DEFAULT_POOL_FAMILY_KEY)
end
diff --git a/src/app/views/admin/pool_families/_history.haml
b/src/app/views/admin/pool_families/_history.haml
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/views/admin/pool_families/_list.haml
b/src/app/views/admin/pool_families/_list.haml
index 7c31719..a824676 100644
--- a/src/app/views/admin/pool_families/_list.haml
+++ b/src/app/views/admin/pool_families/_list.haml
@@ -10,7 +10,7 @@
%table#pool_famlies_table
= sortable_table_header @header
- - unless @pool_families.blank?
+ - unless @pool_families.blank?
- @pool_families.each do |pool_family|
%tr
%td
@@ -18,6 +18,5 @@
%input{:name => "pool_family_selected[]", :type => "checkbox",
:value => pool_family.id, :id => "pool_family_checkbox_#{pool_family.id}",
:checked => selected }
= link_to pool_family.name, admin_pool_family_path(pool_family)
%td
-
%td
xx %
diff --git a/src/app/views/admin/pool_families/_permissions.haml
b/src/app/views/admin/pool_families/_permissions.haml
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/views/admin/pool_families/_pools.haml
b/src/app/views/admin/pool_families/_pools.haml
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/views/admin/pool_families/_provider_accounts.haml
b/src/app/views/admin/pool_families/_provider_accounts.haml
new file mode 100644
index 0000000..e69de29
--
1.7.3.4
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
