Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

4 files changed, 29 insertions, 15 deletions

diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml
index dd7aad2..1e3345e 100644
--- a/application/modules/user/views/scripts/client/index.phtml
+++ b/application/modules/user/views/scripts/client/index.phtml
@@ -20,7 +20,8 @@
 							'module'	=> 'user',
 							'controller' => 'client',
 							'action'     => 'editclient',
-							'clientID'	=> $client['clientID']
+							'clientID'	=> $client['clientID'],
+							'page'		=> $this->page
 						),
 						'default',
 						true) ?>"><img src='/media/img/edit.png' alt='Edit Client'/></a></td>
@@ -29,7 +30,8 @@
 							'module'	=> 'user',
 							'controller' => 'client',
 							'action'     => 'removeclient',
-							'clientID'	=> $client['clientID']
+							'clientID'	=> $client['clientID'],
+							'page'		=> $this->page
 						),
 						'default',
 						true) ?>"><img src='/media/img/delete.png' alt='Delete Client'/></a></td>
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index 8ca6174..bb7f11a 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -26,7 +26,8 @@
 						'module'	=> 'user',
 						'controller' => 'filter',
 						'action'     => 'editfilter',
-						'filterID'	=> $filter->getID()
+						'filterID'	=> $filter->getID(),
+						'page'		=> $this->page
 					),
 					'default',
 					true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a></td>
@@ -35,7 +36,8 @@
 						'module'	=> 'user',
 						'controller' => 'filter',
 						'action'     => 'removefilter',
-						'filterID'	=> $filter->getID()
+						'filterID'	=> $filter->getID(),
+						'page'		=> $this->page
 					),
 					'default',
 					true) ?>"><img src='/media/img/delete.png' alt='Delete Filter'/></a></td>
@@ -44,7 +46,8 @@
 						'module'	=> 'user',
 						'controller' => 'filter',
 						'action'     => 'addfilterentry',
-						'filterID'	=> $filter->getID()
+						'filterID'	=> $filter->getID(),
+						'page'		=> $this->page
 					),
 					'default',
 					true) ?>"><img src='/media/img/add.png' alt='Add Filterentry'/></a></td>
@@ -89,7 +92,8 @@
 							'module'	=> 'user',
 							'controller' => 'filter',
 							'action'     => 'editfilterentry',
-							'filterentriesID'	=> $filterentry['filterentriesID']
+							'filterentriesID'	=> $filterentry['filterentriesID'],
+						'page'		=> $this->page
 						),
 						'default',
 						true) ?>"><img src='/media/img/edit.png' alt='Edit Filterentry'/></a>
@@ -98,7 +102,8 @@
 							'module'	=> 'user',
 							'controller' => 'filter',
 							'action'     => 'removefilterentry',
-							'filterentriesID'	=> $filterentry['filterentriesID']
+							'filterentriesID'	=> $filterentry['filterentriesID'],
+						'page'		=> $this->page
 						),
 						'default',
 						true) ?>"><img src='/media/img/delete.png' alt='Delete Filterentry'/></a>		
@@ -111,7 +116,7 @@
 	<?php endif;?>
     <?php endforeach ?> 
     </table>
-
+ 	<?php echo $this->pagination; ?>
 	
 <?php else: ?>
  
diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
index 7e6e400..36934f6 100644
--- a/application/modules/user/views/scripts/pool/index.phtml
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -24,7 +24,8 @@
 							'module'	=> 'user',
 							'controller' => 'pool',
 							'action'     => 'editpool',
-							'poolID'	=> $pool->getID()
+							'poolID'	=> $pool->getID(),
+							'page'		=> $this->page
 						),
 						'default',
 						true) ?>"><img src='/media/img/edit.png' alt='Edit Pool'/></a></td>
@@ -33,7 +34,8 @@
 							'module'	=> 'user',
 							'controller' => 'pool',
 							'action'     => 'deletepool',
-							'poolID'	=> $pool->getID()
+							'poolID'	=> $pool->getID(),
+							'page'		=> $this->page
 						),
 						'default',
 						true) ?>"><img src='/media/img/delete.png' alt='Delete Pool'/></a></td>
@@ -42,7 +44,8 @@
 							'module'	=> 'user',
 							'controller' => 'pool',
 							'action'     => 'linkclient',
-							'poolID'	=> $pool->getID()
+							'poolID'	=> $pool->getID(),
+							'page'		=> $this->page
 						),
 						'default',
 						true) ?>"><img src='/media/img/add.png' alt='Link Client'/></a></td>
@@ -78,7 +81,8 @@
 						'module'	=> 'user',
 						'controller' => 'pool',
 						'action'     => 'unlinkclient',
-						'poolentriesID'	=> $client['poolentriesID']
+						'poolentriesID'	=> $client['poolentriesID'],
+						'page'		=> $this->page
 					),
 					'default',
 					true) ?>"><img src='/media/img/delete.png' alt='Unlink Client'/></a></td>
@@ -117,6 +121,7 @@ foreach ($this->freeclients as $client): ?>
 						'action'     => 'linkclient',
 						'clientID'	=> $client['clientID'],
 						'poolID'	=> $pool->getID(),
+						'page'		=> $this->page
 					),
 					'default',
 					true) ?>"><?php echo $pool->getTitle(); ?></option>
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 408dcc4..6c6f8f5 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -44,7 +44,8 @@ if($this->roleID) {
 		if(isset($this->rightcategorieslist)) {
 			foreach($this->rightcategorieslist as $k => $v) {
 				$rights = $this->rightsList[$k];
-				?>
+				if(count($rights) > 0) {
+					?>
 <h3><?php echo $v; ?></h3>
 <table>
 	<tr>
@@ -76,6 +77,7 @@ if($this->roleID) {
 	?>
 </table>
 	<?php
+				}
 			}
 		}
 	} else {
@@ -84,6 +86,6 @@ if($this->roleID) {
 <center>
 <h3>No Rights have been added!</h3>
 </center>
-<?php
-}
+		<?php
+	}
 }
\ No newline at end of file