From 511d6fc9976bd10344c920a4f03ba57da70527d9 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Wed, 2 Apr 2008 16:32:26 -0400 Subject: Make changes in order to assure that users not in users.conf can still read web content if cleared past the authentication layer. Also make changes to the kickstart editor to indicate to users when they don't have permission to edit kickstarts -- and to show possible causes. --- webui_templates/enoaccess.tmpl | 2 ++ webui_templates/ksfile_edit.tmpl | 33 ++++++++++++++++++++++++++++++--- webui_templates/ksfile_view.tmpl | 6 ------ 3 files changed, 32 insertions(+), 9 deletions(-) delete mode 100644 webui_templates/ksfile_view.tmpl (limited to 'webui_templates') diff --git a/webui_templates/enoaccess.tmpl b/webui_templates/enoaccess.tmpl index 5af1ae3..b3a001e 100644 --- a/webui_templates/enoaccess.tmpl +++ b/webui_templates/enoaccess.tmpl @@ -5,6 +5,8 @@ WARNING: You do not have permission to make changes to this object. To recieve access, contact your Cobbler server administrator.
+#if $owners != [] The access control list for this object is: $myowners. +#end if diff --git a/webui_templates/ksfile_edit.tmpl b/webui_templates/ksfile_edit.tmpl index 5e0c5ae..87c9f41 100644 --- a/webui_templates/ksfile_edit.tmpl +++ b/webui_templates/ksfile_edit.tmpl @@ -1,7 +1,22 @@ #extends cobbler.webui.master -#attr $title = "Cobbler: Edit Kickstart File $ksfile" +##attr $title = "Cobbler: Edit Kickstart File $ksfile" #block body + +#if $editable != True +
+NOTE: You do not have permission to make changes to this +kickstart template and can only read it. It is possible that +other Cobbler users has secured permissions on Cobbler +profiles/systems that depend on this template -- changing this +template would ultimately affect those profile/system records which +you do not have access to. Alternatively, you may not have access +to edit *any* kickstart templates. Contact your Cobbler server administrator +if you need to resolve this. +
+
+#end if +
@@ -10,8 +25,20 @@

- - + #if $editable == True + + + #end if +
+ +#if $editable == True +
+
+NOTE: Run a cobbler sync to after making changes here in order +for kickstart files to be regenerated. +
+#end if + #end block body diff --git a/webui_templates/ksfile_view.tmpl b/webui_templates/ksfile_view.tmpl deleted file mode 100644 index b6abf67..0000000 --- a/webui_templates/ksfile_view.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -#extends cobbler.webui.master - -#block body -
$ksdata
-#end block body - -- cgit