projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed time.php for subgroup support in high rank situations.
[timetracker.git]
/
admin_group_edit.php
diff --git
a/admin_group_edit.php
b/admin_group_edit.php
index
a1157fb
..
bb0fc41
100644
(file)
--- a/
admin_group_edit.php
+++ b/
admin_group_edit.php
@@
-29,7
+29,7
@@
require_once('initialize.php');
import('form.Form');
import('ttUserHelper');
require_once('initialize.php');
import('form.Form');
import('ttUserHelper');
-import('tt
TeamHelper
');
+import('tt
Admin
');
// Access checks.
if (!ttAccessAllowed('administer_site')) {
// Access checks.
if (!ttAccessAllowed('administer_site')) {
@@
-39,7
+39,9
@@
if (!ttAccessAllowed('administer_site')) {
// End of access checks.
$group_id = $request->getParameter('id');
// End of access checks.
$group_id = $request->getParameter('id');
-$group_details = ttTeamHelper::getTeamDetails($group_id);
+
+$admin = new ttAdmin();
+$group_details = $admin->getGroupDetails($group_id);
if ($request->isPost()) {
$cl_group_name = trim($request->getParameter('group_name'));
if ($request->isPost()) {
$cl_group_name = trim($request->getParameter('group_name'));
@@
-51,7
+53,7
@@
if ($request->isPost()) {
}
$cl_manager_email = trim($request->getParameter('manager_email'));
} else {
}
$cl_manager_email = trim($request->getParameter('manager_email'));
} else {
- $cl_group_name = $group_details['
team
_name'];
+ $cl_group_name = $group_details['
group
_name'];
$cl_manager_name = $group_details['manager_name'];
$cl_manager_login = $group_details['manager_login'];
if (!$auth->isPasswordExternal()) {
$cl_manager_name = $group_details['manager_name'];
$cl_manager_login = $group_details['manager_login'];
if (!$auth->isPasswordExternal()) {
@@
-77,7
+79,7
@@
if ($request->isPost()) {
if ($request->getParameter('btn_save')) {
// Create fields array for ttAdmin instance.
$fields = array(
if ($request->getParameter('btn_save')) {
// Create fields array for ttAdmin instance.
$fields = array(
- 'old_group_name' => $group_details['
team
_name'],
+ 'old_group_name' => $group_details['
group
_name'],
'new_group_name' => $cl_group_name,
'user_id' => $group_details['manager_id'],
'user_name' => $cl_manager_name,
'new_group_name' => $cl_group_name,
'user_id' => $group_details['manager_id'],
'user_name' => $cl_manager_name,
@@
-93,7
+95,8
@@
if ($request->isPost()) {
if ($result) {
header('Location: admin_groups.php');
exit();
if ($result) {
header('Location: admin_groups.php');
exit();
- }
+ } else
+ $err->add($i18n->get('error.db'));
}
if ($request->getParameter('btn_cancel')) {
}
if ($request->getParameter('btn_cancel')) {