Forms Rechte angepasst, Views angepasst

5 files changed, 16 insertions, 20 deletions

diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index 23f7780..526edc0 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -9,10 +9,9 @@
     <th>ID <span class='code'>bootosID</span></th>
     <th>Title <span class='code'>title</span></th>
     <th>GroupID <span class='code'>groupID</span></th>
-    <th>MembershipID <span class='code'>membershipID</span></th>
     <th>PrebootID <span class='code'>prebootID</span></th>
     <th>Serialnumber <span class='code'>serialnumber</span></th>
-    <th>Created <span class='code'>created</span></th>    
+    <th>Changed <span class='code'>created</span></th>    
     <th>Expires <span class='code'>expires</span></th>
     <th>Public <span class='code'>public</span></th>
  	<th colspan=3>Actions</th>
@@ -24,10 +23,9 @@
     <td><?php echo $this->escape($bootiso->getID()); ?></td>
     <td><?php echo $this->escape($bootiso->getTitle()); ?></td>
     <td><?php echo $this->escape($bootiso->getGroupID()); ?></td>
-    <td><?php echo $this->escape($bootiso->getMembershipID()); ?></td>    
-    <td><?php echo "[" . $this->escape($bootiso->getPrebootID()) . "] " . $this->prebootlist[$bootiso->getID()]; ?></td>
+    <td><?php echo $this->escape($bootiso->getPrebootID()); ?></td>
 	<td><?php echo $this->escape($bootiso->getSerialnumber()); ?></td>
-    <td><?php echo $this->escape(date('Y-m-d H:i:s', $bootiso->getCreated())); ?></td>
+    <td><?php echo $this->escape($bootiso->getCreated()); ?></td>
     <td><?php echo $this->escape($bootiso->getExpires()); ?></td>
     <td><?php echo $this->escape($bootiso->getPublic()); ?></td>
     <td class='action'><a href="<?php echo $this->url(
@@ -35,7 +33,6 @@
 						'module'	=> 'user',
 						'controller' => 'bootiso',
 						'action'     => 'downloadbootiso',
-						'prebootID'   =>  $bootiso->getprebootID(),
 						'bootisoID' => $bootiso->getID(),
 						'page'		=> $this->page
 					),
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index b580237..01842c1 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -18,7 +18,7 @@
   <tr class=entry>
     <td><?php echo $this->escape($bootmenu->getID()); ?></td>
     <td><?php echo $this->escape($bootmenu->getTitle()); ?></td>
-    <td><?php echo $this->escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?></td>
+    <td><?php echo $this->escape($bootmenu->getCreated()); ?></td>
     <td class='action'><a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
@@ -65,7 +65,7 @@
     <th>kcl</th>
 	<th>kclappend</th>
     <th>Config</th>
-    <th>Position</th>
+<!--    <th>Position</th>-->
  	<th colspan=2>Actions</th>
     
   </tr>
@@ -89,9 +89,9 @@
 		<td><?php echo $this->escape($bootmenuentry->getBootosID()) ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getKcl()); ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getKclappend()); ?></td>
-		<td><?php echo $this->escape($bootmenuentry->getConfigID()) ?></td>
+		<td><?php echo $this->escape($bootmenuentry->getConfigID()) ?></td><!--
 		<td><?php echo $this->escape($bootmenuentry->getOrder() + 1); ?></td>
-		<td class='action'><a href="<?php echo $this->url(
+		--><td class='action'><a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'bootmenu',
diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml
index a678cef..0ea8f77 100644
--- a/application/modules/user/views/scripts/bootos/index.phtml
+++ b/application/modules/user/views/scripts/bootos/index.phtml
@@ -14,7 +14,6 @@
 		<th>ID <span class='code'>bootosID</span></th>
 		<th>Title <span class='code'>title</span></th>
 		<th>GroupID <span class='code'>groupID</span></th>
-		<th>MembershipID <span class='code'>membershipID</span></th>
 		<th>ConfigID <span class='code'>configID</span></th>
 		<th>Init <span class='code'>init</span></th>
 		<th>Kernel <span class='code'>kernel</span></th>
@@ -32,13 +31,12 @@
 		<td><?php echo $this->escape($bootos->getID()); ?></td>
 		<td><?php echo $this->escape($bootos->getTitle()); ?></td>
 		<td><?php echo $this->escape($bootos->getGroupID()); ?></td>
-		<td><?php echo $this->escape($bootos->getMembershipID()); ?></td>
 		<td><?php echo $this->escape($bootos->getConfigID()); ?></td>
 		<td><?php echo $this->escape($bootos->getPath_init()); ?></td>
 		<td><?php echo $this->escape($bootos->getPath_kernel()); ?></td>
 		<td><?php echo $this->escape($bootos->getDefaultkcl()); ?></td>
 		<td><?php echo $this->escape($bootos->getDescription()); ?></td>
-		<td><?php echo $this->escape(date('Y-m-d H:i:s', $bootos->getCreated())); ?></td>
+		<td><?php echo $this->escape($bootos->getCreated()); ?></td>
 		<td><?php echo $this->escape($bootos->getExpires()); ?></td>
 		<td><?php echo $this->escape($bootos->getPublic()); ?></td>
 		<?php if($this->update[$bootos->getID()]==true): ?>
diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml
index b651f63..0b62f7e 100644
--- a/application/modules/user/views/scripts/config/index.phtml
+++ b/application/modules/user/views/scripts/config/index.phtml
@@ -1,15 +1,18 @@
 <h1>Config</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
 <?php echo $this->searchform; ?>
+
 <?php echo $this->formButton('createconfig', 'Create Config', array(
 							'onclick' => 'self.location="/user/config/createconfig/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
 
+
 <table>
   <tr>
+  <?php if(Pbs_Acl::checkRight('csai')): ?>
     <th>ID <span class='code'>configID</span></th>
+  <?php endif; ?>
     <th>Title <span class='code'>title</span></th>
-    <th>GroupID <span class='code'>groupID</span></th>
     <th>Shellscript <span class='code'>shellscript</span></th>
     <th>Changed <span class='code'>created</span></th>
  	<th colspan=2>Actions</th>
@@ -18,9 +21,10 @@
   	echo "</table> There are no Config's to display." ?>
   <?php foreach ($this->configlist as $config): ?>
   <tr class=entry>
+   <?php if(Pbs_Acl::checkRight('csai')): ?>
     <td><?php echo $this->escape($config->getID()); ?></td>
+   <?php endif; ?>
     <td><?php echo $this->escape($config->getTitle()); ?></td>
-    <td><?php echo $this->escape($config->getGroupID()); ?></td>
     <td><?php echo $this->escape($config->getShellscript()); ?></td>
     <td><?php echo $this->escape($config->getCreated()); ?></td>
     <td class='action'><a href="<?php echo $this->url(
@@ -50,6 +54,7 @@
 
 
 
+
 	
 	
 	
diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml
index 295f1ca..f1829e1 100644
--- a/application/modules/user/views/scripts/preboot/index.phtml
+++ b/application/modules/user/views/scripts/preboot/index.phtml
@@ -12,8 +12,6 @@
   <tr>
     <th>ID <span class='code'>prebootID</span></th>
     <th>Title <span class='code'>title</span></th>
-    <th>GroupID <span class='code'>groupID</span></th>
-    <th>MembershipID <span class='code'>membershipID</span></th>
     <th>Preboot Path <span class='code'>path_preboot</span></th>
  	<th colspan=3>Actions</th>
   </tr>
@@ -22,9 +20,7 @@
   <?php foreach ($this->prebootlist as $preboot): ?>
   <tr class=entry>
     <td><?php echo $this->escape($preboot->getID()); ?></td>
-    <td><?php echo $this->escape($preboot->getTitle()); ?></td>
-    <td><?php echo $this->escape($preboot->getGroupID()); ?></td>
-    <td><?php echo $this->escape($preboot->getMembershipID()); ?></td>    
+    <td><?php echo $this->escape($preboot->getTitle()); ?></td>  
 	<td><?php echo $this->escape($preboot->getPath_preboot()); ?></td>
 	<?php if($this->update[$preboot->getID()]==true): ?>
 		<td class='action'><a href="<?php echo $this->url(