summaryrefslogtreecommitdiffstats
path: root/application/modules/user/views
diff options
context:
space:
mode:
authorSimon2011-03-28 15:09:04 +0200
committerSimon2011-03-28 15:09:04 +0200
commit7f128bfd11824b832e4e64a1b13011e837c54366 (patch)
tree5806900894bac7374bb5c655752afffb88d489a8 /application/modules/user/views
parentquickfix gegen account löschen (diff)
parentEinführung von Vererbung von Rollen (diff)
downloadpbs2-7f128bfd11824b832e4e64a1b13011e837c54366.tar.gz
pbs2-7f128bfd11824b832e4e64a1b13011e837c54366.tar.xz
pbs2-7f128bfd11824b832e4e64a1b13011e837c54366.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/views')
-rw-r--r--application/modules/user/views/scripts/role/show.phtml2
1 files changed, 2 insertions, 0 deletions
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 9abab1a..8213e73 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -13,10 +13,12 @@ if($this->roleID) {
<tr>
<th>Title</th>
<th>Description</th>
+ <th>Inheritance</th>
</tr>
<tr class="entry">
<td><?php echo $this->role->getTitle(); ?></td>
<td><?php echo $this->role->getDescription(); ?></td>
+ <td><?php if($this->role->getInheritance() == 1) echo "yes"; else echo "no"; ?></td>
</tr>
</table>
<br />