diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 1af6636c6a..5178ed0dfb 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -76,7 +76,7 @@
id; ?>
date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?> |
- todo->typeList->{$todo->type};?> |
+ todo->typeList[$todo->type];?> |
pri;?>'>pri?> |
createLink('todo', 'view', "id=$todo->id&from=my"), $todo->name);?> |
begin;?> |
diff --git a/module/todo/config.php b/module/todo/config.php
index 09bc320557..f236e7d1c6 100644
--- a/module/todo/config.php
+++ b/module/todo/config.php
@@ -1,6 +1,11 @@
todo = new stdclass();
$config->todo->batchCreate = 8;
+$config->todo->create = new stdclass();
+$config->todo->edit = new stdclass();
+$config->todo->dates = new stdclass();
+$config->todo->times = new stdclass();
$config->todo->create->requiredFields = 'name';
$config->todo->edit->requiredFields = 'name';
$config->todo->dates->end = 15;
@@ -8,7 +13,9 @@ $config->todo->times->begin = 6;
$config->todo->times->end = 23;
$config->todo->times->delta = 10;
+$config->todo->editor = new stdclass();
$config->todo->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
$config->todo->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->todo->list = new stdclass();
$config->todo->list->exportFields = 'id, account, date, begin, end, type, idvalue, pri, name, desc, status, private';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index d21311fa7d..3ad4aced69 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -61,9 +61,9 @@ $lang->todo->priList[1] = '1';
$lang->todo->priList[2] = '2';
$lang->todo->priList[4] = '4';
-$lang->todo->typeList->custom = 'Custom';
-$lang->todo->typeList->bug = 'Bug';
-$lang->todo->typeList->task = 'Task';
+$lang->todo->typeList['custom'] = 'Custom';
+$lang->todo->typeList['bug'] = 'Bug';
+$lang->todo->typeList['task'] = 'Task';
$lang->todo->confirmDelete = "Are you sure to delete this todo?";
$lang->todo->successMarked = "Successfully changed status";;
@@ -81,4 +81,6 @@ $lang->todo->lastmonthTodos = 'Last Month';
$lang->todo->thisseasonTodos = 'This Season';
$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);
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 5be58b2a8f..3c062b6636 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -61,9 +61,9 @@ $lang->todo->priList[1] = '最高';
$lang->todo->priList[2] = '较高';
$lang->todo->priList[4] = '最低';
-$lang->todo->typeList->custom = '自定义';
-$lang->todo->typeList->bug = 'Bug';
-$lang->todo->typeList->task = '项目任务';
+$lang->todo->typeList['custom'] = '自定义';
+$lang->todo->typeList['bug'] = 'Bug';
+$lang->todo->typeList['task'] = '项目任务';
$lang->todo->confirmDelete = "您确定要删除这个todo吗?";
$lang->todo->successMarked = "成功切换状态!";
@@ -81,4 +81,6 @@ $lang->todo->lastmonthTodos = '上月';
$lang->todo->thisseasonTodos = '本季';
$lang->todo->thisyearTodos = '本年';
$lang->todo->thismonthTodos = '本月';
+
+$lang->todo->action = new stdclass();
$lang->todo->action->marked = array('main' => '$date, 由 $actor 标记为$extra。', 'extra' => $lang->todo->statusList);
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index ff49369ac5..f8b93f954e 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -23,7 +23,7 @@
| todo->type;?> |
- todo->typeList->{$todo->type};?> |
+ todo->typeList[$todo->type];?> |
| todo->pri;?> |
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 7dc1b80b6b..0c567b7b09 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -24,7 +24,7 @@
| todo->type;?> |
- todo->typeList->{$todo->type};?> |
+ todo->typeList[$todo->type];?> |
| todo->pri;?> |
diff --git a/module/user/config.php b/module/user/config.php
index e688b2707b..dcb7d7dbdf 100644
--- a/module/user/config.php
+++ b/module/user/config.php
@@ -1,4 +1,8 @@
user = new stdclass();
+$config->user->create = new stdclass();
+$config->user->edit = new stdclass();
+
$config->user->create->requiredFields = 'account,realname,password,password1,password2';
$config->user->edit->requiredFields = 'account,realname';
$config->user->failTimes = 6;
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index bb74302e72..0d60c92bd4 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -53,7 +53,7 @@
| id;?> |
date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?> |
- todo->typeList->{$todo->type};?> |
+ todo->typeList[$todo->type];?> |
pri;?>'>pri?> |
id", $todo->name)) echo $todo->name;?> |
begin;?> |