ACHTUNG: Habe in einigen Mappern die find() Methode geändert, sie liefern jetzt ein Object des Models zurück und nehmen als Parameter die ID! (Group, Config, Membership, Person, u.a.) || Alle Controller soweit fertig

4 files changed, 18 insertions, 6 deletions

diff --git a/application/views/scripts/bootiso/index.phtml b/application/views/scripts/bootiso/index.phtml
index f529ff3..5e1fade 100644
--- a/application/views/scripts/bootiso/index.phtml
+++ b/application/views/scripts/bootiso/index.phtml
@@ -14,6 +14,8 @@
     <th>Expires</th>
     <th>Public</th>
   </tr>
+  <?php if(count($this->bootisolist)==0)
+  		echo "</table> There are no BootISO's entries for the Bootmenuto display." ?>
   <?php foreach ($this->bootisolist as $bootiso): ?>
   <tr class=entry>
     <td><?php echo $this->escape($bootiso->getID()); ?></td>
diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml
index 70bb134..a4475cf 100644
--- a/application/views/scripts/bootmenu/index.phtml
+++ b/application/views/scripts/bootmenu/index.phtml
@@ -12,6 +12,8 @@
     <th>MembershipID</th>
     <th>Changed</th>
   </tr>
+  <?php if(count($this->bootmenulist)==0)
+  	echo "</table> There are no BootMenus to display." ?>
   <?php foreach ($this->bootmenulist as $bootmenu): ?>
   <tr class=bootmenu>
     <td><?php echo $this->escape($bootmenu->getID()); ?></td>
@@ -45,24 +47,27 @@
 					'default',
 					true) ?>">Add Entry</a></td>
   </tr>
+  
   <tr>
   	<th></th>
 	<th>ID</th>
     <th>Title</th>
 <!--	<th>BootmenuID</th>-->
-    <th>BootOSID</th>
+    <th>BootOS</th>
     <th>kcl</th>
-    <th>ConfigID</th>
-    <th>order</th>
+    <th>Config</th>
+    <th>Position</th>
   </tr>
   	<?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?>	
-  	<tr class=bootentry><td class=nostyle></td>	
+  	<?php $bootos = $this->bootosmapper->find($bootmenuentry->getBootosID());?>
+  	<?php $config = $this->configmapper->find($bootmenuentry->getConfigID());?>
+  	<tr><td></td>	
 		<td><?php echo $this->escape($bootmenuentry->getID()); ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getTitle()); ?></td>
 		<!--<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td>
-		--><td><?php echo "[".$this->escape($bootmenuentry->getBootosID()."] ". $this->bootosmapper->find($bootmenuentry->getBootosID())->getTitle()); ?></td>
+		--><td><?php echo "[".$this->escape($bootmenuentry->getBootosID()."] ". $bootos->getTitle()); ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getkcl()); ?></td>
-		<td><?php echo $this->escape($bootmenuentry->getConfigID()); ?></td>
+		<td><?php echo "[".$this->escape($bootmenuentry->getConfigID()."] ". $config->getTitle()); ?></td>
 		<td><?php echo $this->escape($bootmenuentry->getOrder() + 1); ?></td>
 		<td><a href="<?php echo $this->url(
 					array(
@@ -90,6 +95,7 @@
 
 
 
+
 	
 	
 	
diff --git a/application/views/scripts/bootos/index.phtml b/application/views/scripts/bootos/index.phtml
index fefd219..437b502 100644
--- a/application/views/scripts/bootos/index.phtml
+++ b/application/views/scripts/bootos/index.phtml
@@ -18,6 +18,8 @@
     <th>Expires</th>
     <th>Public</th>
   </tr>
+  <?php if(count($this->bootoslist)==0)
+  	echo "</table> There are no BootOs's to display." ?>
   <?php foreach ($this->bootoslist as $bootos): ?>
   <tr class=entry>
     <td><?php echo $this->escape($bootos->getID()); ?></td>
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index 62ab1d4..f7d0fae 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -12,6 +12,8 @@
     <th>Shellscript</th>
     <th>Changed</th>
   </tr>
+  <?php if(count($this->configlist)==0)
+  	echo "</table> There are no Config's to display." ?>
   <?php foreach ($this->configlist as $config): ?>
   <tr class=entry>
     <td><?php echo $this->escape($config->getID()); ?></td>