summaryrefslogtreecommitdiffstats
path: root/modules-available/serversetup-bwlp-ipxe
diff options
context:
space:
mode:
authorSimon Rettberg2019-04-10 14:54:23 +0200
committerSimon Rettberg2019-04-10 14:54:23 +0200
commitfa5cff47e482ef23b3f47f1addb827459ff70c37 (patch)
treec22ab40ae904813b2fd5dd6028af44dca919159a /modules-available/serversetup-bwlp-ipxe
parentInclude .idea in VCS (with proper excludes, hopefully) (diff)
downloadslx-admin-fa5cff47e482ef23b3f47f1addb827459ff70c37.tar.gz
slx-admin-fa5cff47e482ef23b3f47f1addb827459ff70c37.tar.xz
slx-admin-fa5cff47e482ef23b3f47f1addb827459ff70c37.zip
[serversetup-bwlp-ipxe] Fix submenu permission handling
Diffstat (limited to 'modules-available/serversetup-bwlp-ipxe')
-rw-r--r--modules-available/serversetup-bwlp-ipxe/page.inc.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index b6d9e73c..810d8e5b 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -109,8 +109,10 @@ class Page_ServerSetup extends Page
User::assertPermission('access-page');
$addr = false;
- if (User::hasPermission('ipxe.*')) {
+ if (User::hasPermission('ipxe.menu.view')) {
Dashboard::addSubmenu('?do=serversetup&show=menu', Dictionary::translate('submenu_menu', true));
+ }
+ if (User::hasPermission('ipxe.bootentry.view')) {
Dashboard::addSubmenu('?do=serversetup&show=bootentry', Dictionary::translate('submenu_bootentry', true));
}
if (User::hasPermission('edit.address')) {
@@ -123,7 +125,7 @@ class Page_ServerSetup extends Page
if (User::hasPermission('ipxe.localboot.*')) {
Dashboard::addSubmenu('?do=serversetup&show=localboot', Dictionary::translate('submenu_localboot', true));
}
- if (User::hasPermission('ipxe.bootentry.*')) {
+ if (User::hasPermission('ipxe.bootentry.edit')) {
Dashboard::addSubmenu('?do=serversetup&show=import', Dictionary::translate('submenu_import', true));
}
if (Request::get('show') === false) {
filename-only regex match for Tegra' href='/openslx/kernel-qcow2-linux.git/commit/MAINTAINERS?id=bbbe96ed899e8ebde1a12d28f10461eb8bef1074'>bbbe96ed899e ^
c7c4fb18d002 ^






bbbe96ed899e ^
c7c4fb18d002 ^
bbbe96ed899e ^
c7c4fb18d002 ^
bbbe96ed899e ^

c7c4fb18d002 ^
1da177e4c3f4




c7c4fb18d002 ^
1da177e4c3f4
c7c4fb18d002 ^
679655daffdd ^
a6d89915aa66 ^
8b58be884a9f ^
a6d89915aa66 ^

679655daffdd ^
ca7a8e85262e ^
a6d89915aa66 ^
1da177e4c3f4
8b58be884a9f ^
979b6c135fc4 ^
1da177e4c3f4
ca7a8e85262e ^
1da177e4c3f4
c4de0cebc512 ^

1da177e4c3f4
c4de0cebc512 ^
1da177e4c3f4
c4de0cebc512 ^
1da177e4c3f4

8b58be884a9f ^
1da177e4c3f4

679655daffdd ^
1da177e4c3f4

8b58be884a9f ^
1da177e4c3f4

679655daffdd ^
1da177e4c3f4
1da177e4c3f4
c8a75b345b38 ^
8b58be884a9f ^
979b6c135fc4 ^
1da177e4c3f4
a8fe65b8f031 ^
1da177e4c3f4

879a5a001b62 ^
1da177e4c3f4

8ee16a1b8985 ^
08deed1ef62d ^
df6212529c64 ^
679655daffdd ^
1da177e4c3f4

979b6c135fc4 ^
0cf445ceaf43 ^
644570b83026 ^
1da177e4c3f4
67543e508d74 ^
8b58be884a9f ^


ce00f85c45d7 ^
27a2a5ff41e3 ^
8a6e25357d51 ^
eeba444a5d56 ^
ce00f85c45d7 ^
679655daffdd ^

2315cb14010c ^




67543e508d74 ^
91952bc0b48a ^









e2d1d6c0a5d3 ^
8b58be884a9f ^
e2d1d6c0a5d3 ^

1da177e4c3f4
679655daffdd ^

1da177e4c3f4
249e3c85afb9 ^
93d0cc588345 ^
f2b84bbcebfd ^

679655daffdd ^
f2b84bbcebfd ^
249e3c85afb9 ^
8b58be884a9f ^
249e3c85afb9 ^

679655daffdd ^
249e3c85afb9 ^
1da177e4c3f4
8b58be884a9f ^
1da177e4c3f4

531c4f896ca3 ^
1da177e4c3f4
e86435eb91b2 ^
8b58be884a9f ^
d094485323a1 ^
4fc26e36acce ^


e86435eb91b2 ^
745a5d212692 ^
182ae55c1285 ^
d094485323a1 ^
745a5d212692 ^
679655daffdd ^
745a5d212692 ^
1da177e4c3f4
8b58be884a9f ^
ea26d0cff444 ^
6968e50c2b53 ^
38e09d83e99b ^
8a6e25357d51 ^
aaef292acf3a ^
8b59a454c421 ^
679655daffdd ^


43368e74d126 ^
994b942fb4eb ^
89ca78a060a1 ^
15fd830dd310 ^


8b59a454c421 ^
8b59a454c421 ^
8b58be884a9f ^
8b59a454c421 ^
0638bc8dc037 ^
8b59a454c421 ^
679655daffdd ^
1da177e4c3f4
8b59a454c421 ^
8b58be884a9f ^
8b59a454c421 ^
0638bc8dc037 ^
8b59a454c421 ^
679655daffdd ^
998be20fdff1 ^
359acec8cd78 ^
8b58be884a9f ^
8b59a454c421 ^
0638bc8dc037 ^
8b59a454c421 ^
679655daffdd ^
998be20fdff1 ^
bff431e49ff5 ^
d094485323a1 ^
5b9272594b51 ^
679655daffdd ^
bff431e49ff5 ^
2f39d51981e2 ^
8b58be884a9f ^
795fb7e74dff ^


679655daffdd ^
2f39d51981e2 ^
527a1a83cc1b ^

f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^




f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^




f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^




f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^




f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^


1330b0dcf876 ^



1da177e4c3f4
8b58be884a9f ^
cc0b07ed479f ^
1da177e4c3f4
679655daffdd ^

1da177e4c3f4
cae2caae7825 ^
8b58be884a9f ^
cae2caae7825 ^

679655daffdd ^
cae2caae7825 ^
cc0b88cf5ecf ^
cc0b88cf5ecf ^
491b26b40222 ^
e71bcbd0a149 ^
679655daffdd ^
cc0b88cf5ecf ^
e8e31622a17e ^






527a1a83cc1b ^

f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^


45b4e0d54bdb ^
77278d50e04b ^
527a1a83cc1b ^



f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^

77278d50e04b ^
527a1a83cc1b ^


f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^


8c22a8f57516 ^







1da177e4c3f4
8b58be884a9f ^
1da177e4c3f4
679655daffdd ^
1da177e4c3f4
b058b8596136 ^






527a1a83cc1b ^

f8bd42b89132 ^
a3f531ac556d ^
527a1a83cc1b ^


8c6af9e174ab ^
8b58be884a9f ^
8c6af9e174ab ^

679655daffdd ^

8c6af9e174ab ^
1da177e4c3f4
8b58be884a9f ^
1da177e4c3f4
679655daffdd ^
1da177e4c3f4
91952bc0b48a ^



















1da177e4c3f4
6cf515e113fc ^

679655daffdd ^

1da177e4c3f4
e2d1d6c0a5d3 ^
8b58be884a9f ^
e2d1d6c0a5d3 ^

679655daffdd ^