@@ -83,9 +83,9 @@
| begin;?> |
end;?> |
todo->statusList[$todo->status];?> |
-
+ |
createLink('todo', 'mark', "id=$todo->id&status=$todo->status"), $lang->todo->{'mark'.ucfirst($todo->status)}, 'hiddenwin');
+ common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', '', 'hiddenwin');
common::printIcon('todo', 'edit', "id=$todo->id", '', 'list');
common::printIcon('todo', 'delete', "id=$todo->id", '', 'list', '', 'hiddenwin');
?>
diff --git a/module/todo/control.php b/module/todo/control.php
index f9934e7e6d..98c5ab4d98 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -267,26 +267,22 @@ class todo extends control
}
/**
- * Mark status of a todo.
+ * Finish a todo.
*
* @param int $todoID
- * @param string $status wait|doing|done
* @access public
* @return void
*/
- public function mark($todoID, $status)
+ public function finish($todoID)
{
- $this->todo->mark($todoID, $status);
+ $this->todo->finish($todoID);
$todo = $this->todo->getById($todoID);
- if($todo->status == 'done')
+ if($todo->type == 'bug' or $todo->type == 'task')
{
- if($todo->type == 'bug' or $todo->type == 'task')
- {
- $confirmNote = 'confirm' . ucfirst($todo->type);
- $confirmURL = $this->createLink($todo->type, 'view', "id=$todo->idvalue");
- $cancelURL = $this->server->HTTP_REFERER;
- die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, 'parent', 'parent'));
- }
+ $confirmNote = 'confirm' . ucfirst($todo->type);
+ $confirmURL = $this->createLink($todo->type, 'view', "id=$todo->idvalue");
+ $cancelURL = $this->server->HTTP_REFERER;
+ die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, 'parent', 'parent'));
}
die(js::reload('parent'));
}
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 537e7c1383..8a3ac885c4 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -17,10 +17,7 @@ $lang->todo->edit = "Edit";
$lang->todo->batchEdit = "Batch edit";
$lang->todo->view = "Info";
$lang->todo->viewAB = "Info";
-$lang->todo->markDone = "Undone";
-$lang->todo->markWait = "Done";
-$lang->todo->markDoing = "Done";
-$lang->todo->mark = "Change status";
+$lang->todo->finish = "Finish";
$lang->todo->export = "Export";
$lang->todo->delete = "Delete";
$lang->todo->browse = "Browse";
@@ -79,4 +76,4 @@ $lang->todo->thisyearTodos = 'This Year';
$lang->todo->thismonthTodos = 'This Month';
$lang->todo->action = new stdclass();
-$lang->todo->action->marked = array('main' => '$date, Change status to $extra by $actor。', 'extra' => $lang->todo->statusList);
+$lang->todo->action->finished = array('main' => '$date, Finished by $actor');
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 1031a0f552..644f8a4f1c 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -17,10 +17,7 @@ $lang->todo->edit = "更新TODO";
$lang->todo->batchEdit = "批量编辑";
$lang->todo->view = "TODO详情";
$lang->todo->viewAB = "详情";
-$lang->todo->markDone = "未完成";
-$lang->todo->markWait = "已完成";
-$lang->todo->markDoing = "已完成";
-$lang->todo->mark = "更改状态";
+$lang->todo->finish = "完成";
$lang->todo->export = "导出";
$lang->todo->delete = "删除TODO";
$lang->todo->browse = "浏览TODO";
@@ -79,4 +76,4 @@ $lang->todo->thisyearTodos = '本年';
$lang->todo->thismonthTodos = '本月';
$lang->todo->action = new stdclass();
-$lang->todo->action->marked = array('main' => '$date, 由 $actor 标记为$extra。', 'extra' => $lang->todo->statusList);
+$lang->todo->action->finished = array('main' => '$date, 由 $actor完成');
diff --git a/module/todo/model.php b/module/todo/model.php
index f50f1b4ec7..eb58fabed4 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -192,11 +192,10 @@ class todoModel extends model
* @access public
* @return void
*/
- public function mark($todoID, $status)
+ public function finish($todoID)
{
- $status = ($status == 'done') ? 'wait' : 'done';
- $this->dao->update(TABLE_TODO)->set('status')->eq($status)->where('id')->eq((int)$todoID)->exec();
- $this->loadModel('action')->create('todo', $todoID, 'marked', '', $status);
+ $this->dao->update(TABLE_TODO)->set('status')->eq('done')->where('id')->eq((int)$todoID)->exec();
+ $this->loadModel('action')->create('todo', $todoID, 'finished', '', 'done');
return;
}
@@ -318,6 +317,23 @@ class todoModel extends model
}
return $todos;
}
+
+ /**
+ * Judge an action is clickable or not.
+ *
+ * @param object $todo
+ * @param string $action
+ * @access public
+ * @return bool
+ */
+ public function isClickable($todo, $action)
+ {
+ $action = strtolower($action);
+
+ if($action == 'finish') return $todo->status != 'done';
+
+ return true;
+ }
}
|