You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2013/02/22 18:12:46 UTC
[2/3] git commit: Deltacloud - remove unused 'resource_types'
attribute from Realm model part of DTACLOUD-488
https://issues.apache.org/jira/browse/DTACLOUD-488
Deltacloud - remove unused 'resource_types' attribute from Realm model
part of DTACLOUD-488 https://issues.apache.org/jira/browse/DTACLOUD-488
API-Change: remove unused 'resource_types' attribute from Realm
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/d0206371
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/d0206371
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/d0206371
Branch: refs/heads/master
Commit: d020637148e4f85b4a01dd17779d99680eb7ee83
Parents: be1842b
Author: marios <ma...@redhat.com>
Authored: Tue Feb 19 18:39:29 2013 +0200
Committer: marios <ma...@redhat.com>
Committed: Fri Feb 22 18:40:42 2013 +0200
----------------------------------------------------------------------
server/lib/deltacloud/models/realm.rb | 11 -----------
server/views/realms/index.html.haml | 2 --
server/views/realms/show.html.haml | 4 ----
server/views/realms/show.xml.haml | 2 --
4 files changed, 0 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d0206371/server/lib/deltacloud/models/realm.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/models/realm.rb b/server/lib/deltacloud/models/realm.rb
index df69a58..d6e050f 100644
--- a/server/lib/deltacloud/models/realm.rb
+++ b/server/lib/deltacloud/models/realm.rb
@@ -20,16 +20,6 @@ class Realm < BaseModel
attr_accessor :name
attr_accessor :limit
attr_accessor :state
- attr_accessor :resource_types
-
- def initialize(init=nil)
- super(init)
- self.resource_types ||= []
- end
-
- def resource_types
- @resource_types || []
- end
def to_hash(context)
r = {
@@ -39,7 +29,6 @@ class Realm < BaseModel
:state => state,
:limit => limit
}
- r[:resource_types] = resource_types || []
r
end
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d0206371/server/views/realms/index.html.haml
----------------------------------------------------------------------
diff --git a/server/views/realms/index.html.haml b/server/views/realms/index.html.haml
index 91636a8..5e91e56 100644
--- a/server/views/realms/index.html.haml
+++ b/server/views/realms/index.html.haml
@@ -10,6 +10,4 @@
%img{ :class => 'ui-link-thumb', :src => '/images/realm.png'}
%h3= realm.name
%p=[realm.id, realm.limit].join(', ')
- -if realm.resource_types
- %p=realm.resource_types.join(",")
%span{ :class => 'ui-li-count'}=realm.state
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d0206371/server/views/realms/show.html.haml
----------------------------------------------------------------------
diff --git a/server/views/realms/show.html.haml b/server/views/realms/show.html.haml
index e1c16d4..f2c52f7 100644
--- a/server/views/realms/show.html.haml
+++ b/server/views/realms/show.html.haml
@@ -15,7 +15,3 @@
%li{ :'data-role' => 'list-divider'} Limit
%li
%p{ :'data-role' => 'fieldcontain'}=@realm.limit
- - if @realm.resource_types
- %li{ :'data-role' => 'list-divider'} Resource Types
- %li
- %p{ :'data-role' => 'fieldcontain'}=@realm.resource_types
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d0206371/server/views/realms/show.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/realms/show.xml.haml b/server/views/realms/show.xml.haml
index a6e2030..5c06c06 100644
--- a/server/views/realms/show.xml.haml
+++ b/server/views/realms/show.xml.haml
@@ -9,5 +9,3 @@
%limit<
=cdata do
=@realm.limit
- - @realm.resource_types.each do |r|
- %resource_type=r