summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-12-30 13:37:26 +0100
committermsquare <msquare@notrademark.de>2017-12-30 13:37:26 +0100
commit0314ba19e38077b62a2884985b5dd4d50e8af0b0 (patch)
treef4e00a406ace087e85d1386cf51f717db6b6108f
parentc961269bb718cfc5b5889af88fd12bfc86563d09 (diff)
make got t-shirt always available
-rw-r--r--includes/pages/admin_active.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 6a9e96ce..c9f8679d 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -200,22 +200,26 @@ function admin_active()
. _('set active')
. '</a>';
}
- if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) {
+ if ($usr['Aktiv'] == 1) {
$parametersRemove = [
'not_active' => $usr['UID'],
'search' => $search,
];
+ if ($show_all_shifts) {
+ $parametersRemove['show_all_shifts'] = 1;
+ }
+ $actions[] = '<a href="' . page_link_to('admin_active', $parametersRemove) . '">'
+ . _('remove active')
+ . '</a>';
+ }
+ if ($usr['Tshirt'] == 0) {
$parametersShirt = [
'tshirt' => $usr['UID'],
'search' => $search,
];
if ($show_all_shifts) {
- $parametersRemove['show_all_shifts'] = 1;
$parametersShirt['show_all_shifts'] = 1;
}
- $actions[] = '<a href="' . page_link_to('admin_active', $parametersRemove) . '">'
- . _('remove active')
- . '</a>';
$actions[] = '<a href="' . page_link_to('admin_active', $parametersShirt) . '">'
. _('got t-shirt')
. '</a>';