From 654da8565f417addb35dbd6aa935cd964421b512 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Tue, 12 Apr 2022 03:15:39 +0000
Subject: [PATCH] * Fix bug#21649,21512

---
 module/common/model.php    | 2 +-
 module/todo/lang/en.php    | 2 +-
 module/todo/lang/zh-cn.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 801cee3069..3ceaffc0e6 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -419,7 +419,7 @@ class commonModel extends model
                     echo '<li>' . html::a(helper::createLink('my', 'preference', '', '', true), "<i class='icon icon-controls'></i> " . $lang->preference, '', "class='iframe' data-width='700'") . '</li>';
                 }
 
-                echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), "<i class='icon icon-cog-outline'></i> " . $lang->changePassword, '', "class='iframe' data-width='600'") . '</li>';
+                if(common::hasPriv('my', 'changePassword')) echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), "<i class='icon icon-cog-outline'></i> " . $lang->changePassword, '', "class='iframe' data-width='600'") . '</li>';
 
                 echo "<li class='divider'></li>";
             }
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 3763a184f2..54481dad81 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -114,7 +114,7 @@ $lang->todo->noAssignedTo   = "The AssignedTo should not be empty.";
 $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not close.';
 $lang->todo->today          = 'Todo Today';
 
-$lang->todo->periods['all']             = 'All Todos';
+$lang->todo->periods['all']             = 'Assigned To Yourself';
 $lang->todo->periods['before']          = 'Unfinished';
 $lang->todo->periods['future']          = 'TBD';
 $lang->todo->periods['thisWeek']        = 'This Week';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 87df53adad..1b5124f5fa 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -114,7 +114,7 @@ $lang->todo->noAssignedTo   = '被指派人不能为空';
 $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。';
 $lang->todo->today          = '今日待办';
 
-$lang->todo->periods['all']             = '所有';
+$lang->todo->periods['all']             = '指派自己';
 $lang->todo->periods['before']          = '未完';
 $lang->todo->periods['future']          = '待定';
 $lang->todo->periods['thisWeek']        = '本周';