From 3d04fb75a980dba20e51dc91afd49f0eb9ee43fe Mon Sep 17 00:00:00 2001
From: Simon
Date: Wed, 9 Mar 2011 16:31:58 +0100
Subject: Form-Verhalten geändert & Datenbank korrigiert

---
 application/views/scripts/filter/index.phtml | 11 ++++++++---
 application/views/scripts/pool/index.phtml   | 22 +++++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

(limited to 'application/views/scripts')

diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml
index 6f98b4c..a3d3efa 100644
--- a/application/views/scripts/filter/index.phtml
+++ b/application/views/scripts/filter/index.phtml
@@ -43,13 +43,17 @@
 					'default',
 					true) ?>"><img src='/media/img/add.png' alt='Add Filterentry'/></a></td>
 			</tr>
+			<?php
+			$fe = new Application_Model_FilterEntriesMapper();
+				#	print_a($erg = $fe->findBy('filterID',$filter->getID()));
+			$erg = $fe->findBy('filterID',$filter->getID());
+			?>
+			<?php if (count($erg)>0): ?>
 			<tr class=detail>
 			<td class=arrowtop>↳</td>
 			<td colspan=6>
 				<?php
-					$fe = new Application_Model_FilterEntriesMapper();
-						#	print_a($erg = $fe->findBy('filterID',$filter->getID()));
-					$erg = $fe->findBy('filterID',$filter->getID());
+					
 				?>	
 				<table>
 					<tr>
@@ -96,6 +100,7 @@
 				</table>
 			</td>			
         </tr>
+	<?php endif;?>
     <?php endforeach ?> 
     </table>
 
diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml
index f89dbc9..2c6ba16 100644
--- a/application/views/scripts/pool/index.phtml
+++ b/application/views/scripts/pool/index.phtml
@@ -43,6 +43,11 @@
 						'default',
 						true) ?>"><img src='/media/img/add.png' alt='Link Client'/></a></td>
 		</tr>
+		<?php		
+		$poolentriesMapper = new Application_Model_PoolEntriesMapper();
+		$clients = $poolentriesMapper->findBy('poolID',$pool->getID());		
+		?>
+		<?php if (count($clients)>0): ?>
 		<tr class=detail>
 		<td class=arrowtop>↳</td>
 		<td colspan=6>
@@ -54,8 +59,6 @@
  				<th>Actions</th>
 			</tr>
 		<?php
-		$poolentriesMapper = new Application_Model_PoolEntriesMapper();
-		$clients = $poolentriesMapper->findBy('poolID',$pool->getID());
 		foreach ($clients as $client): ?>		
 		<tr>
 			<td><?php echo $client['clientID'];?></td>
@@ -77,14 +80,18 @@
 		</tr>
 		<?php endforeach ?> 
 		</table>
+		</td>
+		</tr>
+	<?php endif;?>
     <?php endforeach ?> 
     </table>
 <h2>Free clients</h2>
 <table >
-<tr><th>ClientID</th><th>MacAdress</th><th>Hardwarehash</th>
-<?php foreach ($this->pools as $pool): ?>
-			<th><?php echo $this->escape($pool->getTitle()) ?></th>
-		<?php endforeach ?> 
+<tr>
+<th>ClientID</th>
+<th>MacAdress</th>
+<th>Hardwarehash</th>
+<th>Actions</th>
 </tr>
 <?php
 foreach ($this->freeclients as $client): ?>
@@ -92,7 +99,8 @@ foreach ($this->freeclients as $client): ?>
 		<td><?php echo $client['clientID']; ?></td>
 		<td><?php echo $client['macadress']; ?></td>
 		<td><?php echo $client['hardwarehash']; ?></td>
-		<td><select>
+		<td><select onChange="location.href=this.options[this.selectedIndex].value">
+		<option></option>
 		<?php foreach ($this->pools as $pool): ?>
 			<option value="<?php echo $this->url(
 					array(
-- 
cgit v1.2.3-55-g7522