summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-03-28 18:00:11 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-03-28 18:00:11 -0400
commitc9ff51e05c0e5e8a86d6a5d3654bf505a3dfdb17 (patch)
treef439862a9cdce57b53870c3d344b3ef84479f3ce
parent9a2c291b0e068d622f6e70e55df29bc7dcc60359 (diff)
downloadthird_party-cobbler-c9ff51e05c0e5e8a86d6a5d3654bf505a3dfdb17.tar.gz
third_party-cobbler-c9ff51e05c0e5e8a86d6a5d3654bf505a3dfdb17.tar.xz
third_party-cobbler-c9ff51e05c0e5e8a86d6a5d3654bf505a3dfdb17.zip
Fix some more bugs with ownership editing/saving. Working well in the WebUI now
with respect to being able to change things, still need to work on better showing denials and what folks can edit.
-rw-r--r--cobbler/item_repo.py2
-rw-r--r--cobbler/item_system.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py
index d65d09b..e796561 100644
--- a/cobbler/item_repo.py
+++ b/cobbler/item_repo.py
@@ -39,6 +39,7 @@ class Repo(item.Item):
self.depth = 2 # arbitrary, as not really apart of the graph
self.arch = "" # use default arch
self.yumopts = {}
+ self.owners = []
def from_datastruct(self,seed_data):
self.parent = self.load_item(seed_data, 'parent')
@@ -51,6 +52,7 @@ class Repo(item.Item):
self.arch = self.load_item(seed_data, 'arch')
self.depth = self.load_item(seed_data, 'depth', 2)
self.yumopts = self.load_item(seed_data, 'yumopts', {})
+ self.owners = self.load_item(seed_data, 'owners', [])
# force this to be saved as a boolean
self.set_keep_updated(self.keep_updated)
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index 51dd063..6b2315a 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -81,7 +81,7 @@ class System(item.Item):
self.parent = self.load_item(seed_data, 'parent')
self.name = self.load_item(seed_data, 'name')
- self.owners = self.load_item(seed_data, 'owners')
+ self.owners = self.load_item(seed_data, 'owners', [])
self.profile = self.load_item(seed_data, 'profile')
self.kernel_options = self.load_item(seed_data, 'kernel_options', {})
self.ks_meta = self.load_item(seed_data, 'ks_meta', {})
@@ -338,7 +338,7 @@ class System(item.Item):
def to_datastruct(self):
return {
'name' : self.name,
- 'owners' : self.set_owners,
+ 'owners' : self.owners,
'profile' : self.profile,
'kernel_options' : self.kernel_options,
'ks_meta' : self.ks_meta,