diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2008-11-11 12:54:26 -0500 |
---|---|---|
committer | Michael DeHaan <mdehaan@redhat.com> | 2008-11-11 12:54:26 -0500 |
commit | 37024ef512d39505893a11cae81fbf90d255cbee (patch) | |
tree | 3bc4c5446770d8bff780ca2a8b13ce60db91ca7b | |
parent | c6ed561909505c24aae03ac2380672d048740802 (diff) | |
download | cobbler-37024ef512d39505893a11cae81fbf90d255cbee.tar.gz cobbler-37024ef512d39505893a11cae81fbf90d255cbee.tar.xz cobbler-37024ef512d39505893a11cae81fbf90d255cbee.zip |
Added code to allow saving of comment field to all objects, added comment field to distro object, TODO: add to rest of objects.
-rw-r--r-- | cobbler/webui/CobblerWeb.py | 23 | ||||
-rw-r--r-- | webui_templates/distro_edit.tmpl | 14 |
2 files changed, 32 insertions, 5 deletions
diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py index 14e2041e..0cb44fca 100644 --- a/cobbler/webui/CobblerWeb.py +++ b/cobbler/webui/CobblerWeb.py @@ -186,7 +186,7 @@ class CobblerWeb(object): } ) - def distro_save(self,name=None,oldname=None,new_or_edit=None,editmode='edit',kernel=None, + def distro_save(self,name=None,comment=None,oldname=None,new_or_edit=None,editmode='edit',kernel=None, initrd=None,kopts=None,koptspost=None,ksmeta=None,owners=None,arch=None,breed=None, osversion=None,delete1=None,delete2=None,recursive=False,**args): @@ -252,6 +252,9 @@ class CobblerWeb(object): self.remote.modify_distro(distro, 'breed', breed, self.token) if osversion: self.remote.modify_distro(distro, 'os-version', osversion, self.token) + if comment: + self.remote.modify_distro(distro, 'comment', comment, self.token) + # now time to save, do we want to run duplication checks? self.remote.save_distro(distro, self.token, editmode) except Exception, e: @@ -315,7 +318,7 @@ class CobblerWeb(object): else: return self.__render('empty.tmpl',{}) - def system_save(self,name=None,oldname=None,editmode="edit",profile=None, + def system_save(self,name=None,oldname=None,comment=None,editmode="edit",profile=None, new_or_edit=None, kopts=None, koptspost=None, ksmeta=None, owners=None, server_override=None, netboot='n', virtpath=None,virtram=None,virttype=None,virtcpus=None,virtfilesize=None,delete1=None, delete2=None, **args): @@ -382,6 +385,8 @@ class CobblerWeb(object): if virtpath: self.remote.modify_system(system, 'virt-path', virtpath, self.token) + if comment: + self.remote.modify_system(system, 'comment', comment, self.token) interfaces = args.get("interface_list","") @@ -521,7 +526,7 @@ class CobblerWeb(object): 'subprofile': subprofile } ) - def profile_save(self,new_or_edit=None,editmode='edit',name=None,oldname=None, + def profile_save(self,new_or_edit=None,editmode='edit',name=None,comment=None,oldname=None, distro=None,kickstart=None,kopts=None,koptspost=None, ksmeta=None,owners=None,enablemenu=None,virtfilesize=None,virtram=None,virttype=None, virtpath=None,repos=None,dhcptag=None,delete1=None,delete2=None, @@ -603,6 +608,9 @@ class CobblerWeb(object): self.remote.modify_profile(profile, 'virt-cpus', virtcpus, self.token) if server_override: self.remote.modify_profile(profile, 'server', server_override, self.token) + if comment: + self.remote.modify_profile(profile, 'comment', comment, self.token) + if repos is None: repos = [] @@ -673,7 +681,7 @@ class CobblerWeb(object): 'editable' : can_edit } ) - def repo_save(self,name=None,oldname=None,new_or_edit=None,editmode="edit", + def repo_save(self,name=None,comment=None,oldname=None,new_or_edit=None,editmode="edit", mirror=None,owners=None,keep_updated=None,mirror_locally=0,priority=99, rpm_list=None,createrepo_flags=None,arch=None,environment=None,yumopts=None, delete1=None,delete2=None,**args): @@ -732,6 +740,9 @@ class CobblerWeb(object): self.remote.modify_repo(repo, 'environment', environment, self.token) if owners: self.remote.modify_repo(repo, 'owners', owners, self.token) + if comment: + self.remote.modify_repo(repo, 'comment', comment, self.token) + self.remote.save_repo(repo, self.token, editmode) @@ -795,7 +806,7 @@ class CobblerWeb(object): } ) - def image_save(self,name=None,oldname=None,new_or_edit=None,editmode='edit',field1=None, + def image_save(self,name=None,comment=None,oldname=None,new_or_edit=None,editmode='edit',field1=None, file=None,arch=None,breed=None,virtram=None,virtfilesize=None,virtpath=None, virttype=None,virtcpus=None,virtbridge=None,imagetype=None,owners=None, osversion=None,delete1=None,delete2=None,recursive=False,**args): @@ -864,6 +875,8 @@ class CobblerWeb(object): self.remote.modify_image(image, 'virt-ram', virtram, self.token) if virttype is not None: self.remote.modify_image(image, 'virt-type', virttype, self.token) + if comment: + self.remote.modify_image(image, 'comment', comment, self.token) self.remote.save_image(image, self.token, editmode) except Exception, e: diff --git a/webui_templates/distro_edit.tmpl b/webui_templates/distro_edit.tmpl index b399ace5..a2789d04 100644 --- a/webui_templates/distro_edit.tmpl +++ b/webui_templates/distro_edit.tmpl @@ -94,6 +94,20 @@ function disablename(value) <tr> <td> + <label for="comment">Comment</label> + </td> + <td> + <textarea rows="5" cols="30" 400px;" name="comment" id="comment"> +#if $distro +$distro.comment +#end if + </textarea> + <p class="context-tip">This is a free-form description field</p> + </td> + </tr> + + <tr> + <td> <label for="kernel">Kernel</label> </td> <td> |