From fb37b1b49aedfe40651dcc57883ddbe9c605374d Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Thu, 13 Dec 2018 21:14:03 +0000 Subject: [PATCH] Initial release of subgroups for testing. Some issues remain, but the functionality is there. --- WEB-INF/config.php.dist | 3 --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/group_edit.tpl | 2 -- WEB-INF/templates/header.tpl | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist index 17b4d087..d8bfe0c1 100644 --- a/WEB-INF/config.php.dist +++ b/WEB-INF/config.php.dist @@ -197,6 +197,3 @@ define('AUTH_MODULE', 'db'); // Height in pixels for the note input field in time.php. Defaults to 40. // define('NOTE_INPUT_HEIGHT', 100); - -// A temporary config option while development of subgroup support is ongoing. To be removed later. -// define('SUBGROUP_DEBUG', false); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index f550c35f..627a2331 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.30.4650 | Copyright © Anuko | +  Anuko Time Tracker 1.18.31.4651 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl index bb83d3a3..0565d763 100644 --- a/WEB-INF/templates/group_edit.tpl +++ b/WEB-INF/templates/group_edit.tpl @@ -26,14 +26,12 @@ function handleTaskRequiredCheckbox() {
-{if isTrue($smarty.const.SUBGROUP_DEBUG)} {if $user->can('manage_subgroups') && $group_dropdown} {/if} -{/if} {if $user->can('manage_basic_settings')} diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl index 546fffaa..8555447b 100644 --- a/WEB-INF/templates/header.tpl +++ b/WEB-INF/templates/header.tpl @@ -89,11 +89,9 @@ {if $user->can('manage_basic_settings')} {$i18n.menu.group} · {/if} -{if isTrue($smarty.const.SUBGROUP_DEBUG)} {if $user->can('manage_subgroups')} {$i18n.menu.subgroups} · {/if} -{/if} {if $user->can('manage_features')} {$i18n.menu.plugins} · {/if} -- 2.20.1
{$i18n.label.group}: {$forms.groupForm.group.control}
{$i18n.label.group_name} (*):