summaryrefslogtreecommitdiffstats
path: root/application/modules/user/views/scripts/group
diff options
context:
space:
mode:
authorSimon2011-04-13 17:56:31 +0200
committerSimon2011-04-13 17:56:31 +0200
commit53bb21d568f085ae496b3a33697575bea070a995 (patch)
tree0aa8b3cad978c4af76f3f64ffde9b9a673e8953b /application/modules/user/views/scripts/group
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-53bb21d568f085ae496b3a33697575bea070a995.tar.gz
pbs2-53bb21d568f085ae496b3a33697575bea070a995.tar.xz
pbs2-53bb21d568f085ae496b3a33697575bea070a995.zip
Rolle wird nicht kopiert sondern gleiche Rolle wie ersteller wird in der neuen Gruppe benutzt
Diffstat (limited to 'application/modules/user/views/scripts/group')
-rw-r--r--application/modules/user/views/scripts/group/index.phtml2
-rw-r--r--application/modules/user/views/scripts/group/show.phtml4
2 files changed, 3 insertions, 3 deletions
diff --git a/application/modules/user/views/scripts/group/index.phtml b/application/modules/user/views/scripts/group/index.phtml
index def21f6..e987ae6 100644
--- a/application/modules/user/views/scripts/group/index.phtml
+++ b/application/modules/user/views/scripts/group/index.phtml
@@ -35,7 +35,7 @@ $class= 'highlight checked';
}
?>
<div class='content'>
- <div class='actions'>
+ <div class='actions'>
<?php if($group->getID() == $this->userIDsNamespace['groupID'] ): ?>
<?php if(Pbs_Acl::checkRight('gsdo') ): ?>
<a href="<?php echo $this->url(
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index 2f4ae4a..f27e333 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -12,13 +12,13 @@ if($this->usergroup == $this->requestgroup){
'class' => 'rightbutton'));
}
}
-else{
+elseif($this->usergroup != $this->requestgroup){
if(Pbs_Acl::checkRight('gd')){
echo $this->formButton('deletegroup', 'Delete', array(
'onclick' => 'self.location="/user/group/delete/groupID/' . $this->group->getID() .'"',
'class' => 'rightbutton'));
}
- if(Pbs_Acl::checkRight('geo')){
+ if(Pbs_Acl::checkRight('ge')){
echo $this->formButton('editgroup', 'Edit', array(
'onclick' => 'self.location="/user/group/edit/groupID/' . $this->group->getID() .'"',
'class' => 'rightbutton'));