summaryrefslogtreecommitdiffstats
path: root/application/modules/user
diff options
context:
space:
mode:
authorSimon2011-04-08 19:00:51 +0200
committerSimon2011-04-08 19:00:51 +0200
commitbb10fcf80e13b171be3bf4bcce7405d7315c3f21 (patch)
tree8203cf8e9f543700cda40ad216fb295e6b35c41a /application/modules/user
parentPool & Client - Je nach Rechten unterschiedliche Anzeigen (diff)
downloadpbs2-bb10fcf80e13b171be3bf4bcce7405d7315c3f21.tar.gz
pbs2-bb10fcf80e13b171be3bf4bcce7405d7315c3f21.tar.xz
pbs2-bb10fcf80e13b171be3bf4bcce7405d7315c3f21.zip
findby in Filter angepasst, Aktionsicons nur bei Berechtigung
Diffstat (limited to 'application/modules/user')
-rw-r--r--application/modules/user/controllers/FilterController.php9
-rw-r--r--application/modules/user/forms/FilterEntry.php2
-rw-r--r--application/modules/user/views/scripts/filter/index.phtml28
3 files changed, 24 insertions, 15 deletions
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index ead81ab..a65aba5 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -260,14 +260,13 @@ class User_FilterController extends Zend_Controller_Action
private function prepareFormData(){
$poolMapper = new Application_Model_PoolMapper();
- $pools = $poolMapper->findBY('groupID',$this->membership->getGroupID());
+ $pools = $poolMapper->findBy(array('groupID'=>$this->membership->getGroupID()),true);
$bootisoMapper = new Application_Model_BootIsoMapper();
- $bootisos = $bootisoMapper->findBY('groupID',$this->membership->getGroupID(),true);
+ $bootisos = $bootisoMapper->findBy(array('groupID'=>$this->membership->getGroupID()),true);
$membershipMapper = new Application_Model_MembershipMapper();
- $memberships = $membershipMapper->findBY('groupID',$this->membership->getGroupID());
-
+ $memberships = $membershipMapper->findBy(array('groupID'=>$this->membership->getGroupID()),true);
$grouppMapper = new Application_Model_GroupMapper();
$group = new Application_Model_Group();
@@ -275,7 +274,7 @@ class User_FilterController extends Zend_Controller_Action
$groups[] = $group->toArray();
$clientMapper = new Application_Model_ClientMapper();
- $clients = $clientMapper->findBY('groupID',$this->membership->getGroupID());
+ $clients = $clientMapper->findBy(array('groupID'=>$this->membership->getGroupID()),true);
return array ( 'clients' => $clients,
'memberships' => $memberships,
diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php
index 3fe1aa7..ce2e4de 100644
--- a/application/modules/user/forms/FilterEntry.php
+++ b/application/modules/user/forms/FilterEntry.php
@@ -74,7 +74,7 @@ class user_Form_FilterEntry extends Zend_Form
'regex',
false,
array(
- '/^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/i',
+ '/^(([0-9]|[1-9][0-9]|0[0-9]{2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([[0-9]|[1-9][0-9]|0[0-9]{2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/i',
'messages' => array(
Zend_Validate_Regex::NOT_MATCH => "'%value%' is not a valid IP-Adress",
Zend_Validate_Regex::INVALID => 'IP-Adress contains invalid characters.'
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index c928216..098c43d 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -1,10 +1,11 @@
<h1>Filters</h1>
<?php if($this->notification != ''){echo $this->notification;} ?>
<?php echo $this->searchform; ?>
+<?php if(Pbs_Acl::checkRight('fa')):?>
<?php echo $this->formButton('createconfig', 'Create Filter', array(
'onclick' => 'self.location="/user/filter/addfilter/page/'.$this->page.'"',
'class' => 'addbutton'))?>
-
+<?php endif;?>
<div class='searchvars'>
<div class='head'>Available searchfilter:</div>
<div class='code'>filterID</div>
@@ -23,6 +24,7 @@
<div class='number'><acronym title='<?php echo $this->escape($filter->getID()) ?>'><?php echo $this->escape($filter->priority) ?></acronym></div>
<div class='content'>
<div class='actions'>
+ <?php if(Pbs_Acl::checkRight('fe') || Pbs_Acl::checkRight('fefp')):?>
<a href="<?php echo $this->url(
array(
'module' => 'user',
@@ -33,6 +35,8 @@
),
'default',
true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a>
+ <?php endif; ?>
+ <?php if(Pbs_Acl::checkRight('fd')):?>
<a href="<?php echo $this->url(
array(
'module' => 'user',
@@ -43,6 +47,8 @@
),
'default',
true) ?>"><img src='/media/img/delete.png' alt='Delete Filter'/></a>
+ <?php endif; ?>
+ <?php if(Pbs_Acl::checkRight('ffa')):?>
<a href="<?php echo $this->url(
array(
'module' => 'user',
@@ -53,6 +59,7 @@
),
'default',
true) ?>"><img src='/media/img/add.png' alt='Add Filterentry'/></a>
+ <?php endif; ?>
</div>
<div class='title'><?php echo $this->escape($filter->title) ?></div>
<div class='subtitle'>
@@ -76,6 +83,7 @@
<div class='element'>
<div class='content'>
<div class='actions'>
+ <?php if(Pbs_Acl::checkRight('ffe')): ?>
<a href="<?php echo $this->url(
array(
'module' => 'user',
@@ -86,6 +94,8 @@
),
'default',
true) ?>"><img src='/media/img/edit.png' alt='Edit Filterentry'/></a>
+ <?php endif; ?>
+ <?php if(Pbs_Acl::checkRight('ffd')): ?>
<a href="<?php echo $this->url(
array(
'module' => 'user',
@@ -96,14 +106,14 @@
),
'default',
true) ?>"><img src='/media/img/delete.png' alt='Delete Filterentry'/></a>
- </div>
-
- <div class='subtitle'><?php echo $title; ?> : <?php
- echo $filterentry['filtervalue'];
- if($filterentry['filtervalue2'] != ''){
- echo " - ".$filterentry['filtervalue2'];
- }
- ?></div>
+ <?php endif; ?>
+ </div>
+ <div class='subtitle'><?php echo $title; ?> : <?php
+ echo $filterentry['filtervalue'];
+ if($filterentry['filtervalue2'] != ''){
+ echo " - ".$filterentry['filtervalue2'];
+ }
+ ?></div>
</div>
<div class='clear'></div>