From f9a1fbdf58e8499caa703895846e4fd66b2d7e89 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 7 Aug 2015 22:11:06 +0000
Subject: [PATCH] tasks: Add ability to close tasks inline.
---
include/class.task.php | 13 +++++--------
include/staff/templates/task-view.tmpl.php | 8 ++++----
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/include/class.task.php b/include/class.task.php
index edf0a0e87..ed8b5a089 100644
--- a/include/class.task.php
+++ b/include/class.task.php
@@ -805,8 +805,8 @@ class Task extends TaskModel implements RestrictedAccess, Threadable {
$assignee = $this->getStaff();
- if (isset($vars['task_status']))
- $this->setStatus($vars['task_status']);
+ if (isset($vars['task:status']))
+ $this->setStatus($vars['task:status']);
$this->onActivity(array(
'activity' => $note->getActivity(),
@@ -835,12 +835,9 @@ class Task extends TaskModel implements RestrictedAccess, Threadable {
return null;
$assignee = $this->getStaff();
- // Set status - if checked.
- if ($vars['reply_status_id']
- && $vars['reply_status_id'] != $this->getStatusId()
- ) {
- $this->setStatus($vars['reply_status_id']);
- }
+
+ if (isset($vars['task:status']))
+ $this->setStatus($vars['task:status']);
/*
// TODO: add auto claim setting for tasks.
diff --git a/include/staff/templates/task-view.tmpl.php b/include/staff/templates/task-view.tmpl.php
index 34c41599f..2d7873c93 100644
--- a/include/staff/templates/task-view.tmpl.php
+++ b/include/staff/templates/task-view.tmpl.php
@@ -394,7 +394,7 @@ else
<td>
<div><?php echo __('Status');?>
<span class="faded"> - </span>
- <select name="task_status">
+ <select name="task:status">
<option value="open" <?php
echo $task->isOpen() ?
'selected="selected"': ''; ?>> <?php
@@ -410,7 +410,7 @@ else
} ?>
</select>
<span class='error'><?php echo
- $errors['task_status']; ?></span>
+ $errors['task:status']; ?></span>
</div>
</td>
</tr>
@@ -454,7 +454,7 @@ else
<td>
<div><?php echo __('Status');?>
<span class="faded"> - </span>
- <select name="task_status">
+ <select name="task:status">
<option value="open" <?php
echo $task->isOpen() ?
'selected="selected"': ''; ?>> <?php
@@ -470,7 +470,7 @@ else
} ?>
</select>
<span class='error'><?php echo
- $errors['task_status']; ?></span>
+ $errors['task:status']; ?></span>
</div>
</td>
</tr>
--
GitLab