projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Starting writing the Work plugin.
[timetracker.git]
/
task_edit.php
diff --git
a/task_edit.php
b/task_edit.php
index
36e717d
..
10410c4
100644
(file)
--- a/
task_edit.php
+++ b/
task_edit.php
@@
-28,17
+28,27
@@
require_once('initialize.php');
import('form.Form');
require_once('initialize.php');
import('form.Form');
-import('tt
Team
Helper');
+import('tt
Group
Helper');
import('ttTaskHelper');
import('ttTaskHelper');
-// Access check.
-if (!ttAccessAllowed('manage_tasks')
|| MODE_PROJECTS_AND_TASKS != $user->tracking_mode
) {
+// Access check
s
.
+if (!ttAccessAllowed('manage_tasks')) {
header('Location: access_denied.php');
exit();
}
header('Location: access_denied.php');
exit();
}
-
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+ header('Location: feature_disabled.php');
+ exit();
+}
$cl_task_id = (int)$request->getParameter('id');
$cl_task_id = (int)$request->getParameter('id');
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$task = ttTaskHelper::get($cl_task_id);
+if (!$task) {
+ header('Location: access_denied.php');
+ exit();
+}
+// End of access checks.
+
+$projects = ttGroupHelper::getActiveProjects();
if ($request->isPost()) {
$cl_name = trim($request->getParameter('name'));
if ($request->isPost()) {
$cl_name = trim($request->getParameter('name'));
@@
-46,11
+56,9
@@
if ($request->isPost()) {
$cl_status = $request->getParameter('status');
$cl_projects = $request->getParameter('projects');
} else {
$cl_status = $request->getParameter('status');
$cl_projects = $request->getParameter('projects');
} else {
- $task = ttTaskHelper::get($cl_task_id);
$cl_name = $task['name'];
$cl_description = $task['description'];
$cl_status = $task['status'];
$cl_name = $task['name'];
$cl_description = $task['description'];
$cl_status = $task['status'];
-
$assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
foreach ($assigned_projects as $project_item)
$cl_projects[] = $project_item['id'];
$assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
foreach ($assigned_projects as $project_item)
$cl_projects[] = $project_item['id'];
@@
-87,13
+95,12
@@
if ($request->isPost()) {
} else
$err->add($i18n->get('error.db'));
} else
} else
$err->add($i18n->get('error.db'));
} else
- $err->add($i18n->get('error.
task
_exists'));
+ $err->add($i18n->get('error.
object
_exists'));
}
if ($request->getParameter('btn_copy')) {
if (!ttTaskHelper::getTaskByName($cl_name)) {
if (ttTaskHelper::insert(array(
}
if ($request->getParameter('btn_copy')) {
if (!ttTaskHelper::getTaskByName($cl_name)) {
if (ttTaskHelper::insert(array(
- 'team_id' => $user->team_id,
'name' => $cl_name,
'description' => $cl_description,
'status' => $cl_status,
'name' => $cl_name,
'description' => $cl_description,
'status' => $cl_status,
@@
-103,12
+110,13
@@
if ($request->isPost()) {
} else
$err->add($i18n->get('error.db'));
} else
} else
$err->add($i18n->get('error.db'));
} else
- $err->add($i18n->get('error.
task
_exists'));
+ $err->add($i18n->get('error.
object
_exists'));
}
}
} // isPost
$smarty->assign('forms', array($form->getName()=>$form->toArray()));
}
}
} // isPost
$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0);
$smarty->assign('title', $i18n->get('title.edit_task'));
$smarty->assign('content_page_name', 'task_edit.tpl');
$smarty->display('index.tpl');
$smarty->assign('title', $i18n->get('title.edit_task'));
$smarty->assign('content_page_name', 'task_edit.tpl');
$smarty->display('index.tpl');