diff --git a/config/zentaopms.php b/config/zentaopms.php index 78d50b8e00..98b7e55e37 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -227,7 +227,7 @@ $config->openMethods[] = 'doc.createbasicinfo'; $config->openMethods[] = 'project.createguide'; $config->openMethods[] = 'task.editteam'; $config->openMethods[] = 'feedback.mergeproductmodule'; -$config->openMethods[] = 'zanode.nodeList'; +$config->openMethods[] = 'zanode.nodelist'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index 47418888f7..ffe36f5c3d 100644 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -120,8 +120,8 @@ $lang->admin->safe->modeList[0] = 'N/A'; $lang->admin->safe->modeList[1] = 'Medium'; $lang->admin->safe->modeList[2] = 'Stark'; -$lang->admin->safe->modeRuleList[1] = 'Beinhaltet Groß und Kleinbuchstaben sowie Ziffern. Länge >= 6.'; -$lang->admin->safe->modeRuleList[2] = 'Beinhaltet Groß und Kleinbuchstaben, Ziffern sowie Sonderzeichen. Länge >= 10.'; +$lang->admin->safe->modeRuleList[1] = 'Beinhaltet Groß und Kleinbuchstaben sowie Ziffern. Länge ≥ 6.'; +$lang->admin->safe->modeRuleList[2] = ' ≥ 10 letters, combination of uppercase, lowercase letters, numbers, and special symbols.'; $lang->admin->safe->reasonList['weak'] = 'Bekannte Schwache Passwörter'; $lang->admin->safe->reasonList['account'] = 'Entspricht ihrem Konto'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 914214cb1a..84298e7fde 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -120,8 +120,8 @@ $lang->admin->safe->modeList[0] = 'I don\'t care.'; $lang->admin->safe->modeList[1] = 'Medium'; $lang->admin->safe->modeList[2] = 'Strong'; -$lang->admin->safe->modeRuleList[1] = ' >= 6 upper and lower case, and numbers.'; -$lang->admin->safe->modeRuleList[2] = ' >= 10 upper and lower case, numbers and special characters.'; +$lang->admin->safe->modeRuleList[1] = ' ≥ 6 upper and lower case, and numbers.'; +$lang->admin->safe->modeRuleList[2] = ' ≥ 10 letters, combination of uppercase, lowercase letters, numbers, and special symbols.'; $lang->admin->safe->reasonList['weak'] = 'Common Weak Password'; $lang->admin->safe->reasonList['account'] = 'Same as account'; @@ -141,4 +141,4 @@ $lang->admin->safe->resetPWDList[0] = 'Off'; $lang->admin->safe->noticeMode = 'The password will be checked when creating and modifying user information, and changing passwords.'; $lang->admin->safe->noticeWeakMode = 'The password will be checked when logging into the system, creating and modifying user information, and changing passwords.'; $lang->admin->safe->noticeStrong = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!'; -$lang->admin->safe->noticeGd = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.'; \ No newline at end of file +$lang->admin->safe->noticeGd = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 745c72f69b..1265ce2008 100644 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -120,8 +120,8 @@ $lang->admin->safe->modeList[0] = "Contrôle Modéré"; $lang->admin->safe->modeList[1] = 'Contrôle Moyen'; $lang->admin->safe->modeList[2] = 'Contrôle Fort'; -$lang->admin->safe->modeRuleList[1] = ' >= 6 Majuscules, minuscules et chiffres.'; -$lang->admin->safe->modeRuleList[2] = ' >= 10 Majuscules, minuscules, chiffres et caractères spéciaux.'; +$lang->admin->safe->modeRuleList[1] = ' ≥ 6 Majuscules, minuscules et chiffres.'; +$lang->admin->safe->modeRuleList[2] = ' ≥ 10 letters, combination of uppercase, lowercase letters, numbers, and special symbols.'; $lang->admin->safe->reasonList['weak'] = 'Mots de passe faibles courants'; $lang->admin->safe->reasonList['account'] = 'Identique au compte'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 33831b046d..779445de62 100644 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -121,7 +121,7 @@ $lang->admin->safe->modeList[1] = '中'; $lang->admin->safe->modeList[2] = '强'; $lang->admin->safe->modeRuleList[1] = '6位及以上,包含大小写字母,数字。'; -$lang->admin->safe->modeRuleList[2] = '10位及以上,包含字母,数字,特殊字符。'; +$lang->admin->safe->modeRuleList[2] = '10位及以上,包含大小写字母,数字,特殊字符。'; $lang->admin->safe->reasonList['weak'] = '常用弱口令'; $lang->admin->safe->reasonList['account'] = '与帐号相同'; diff --git a/module/block/model.php b/module/block/model.php index 65f6a4c647..62af7d80a5 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -166,7 +166,7 @@ class blockModel extends model { $data = array(); - $tasks = $this->dao->select("count(t1.id) as tasks, count(if(t1.status = 'done', 1, null)) as doneTasks")->from(TABLE_TASK)->alias('t1') + $tasks = $this->dao->select("count(distinct t1.id) as tasks, count(distinct if(t1.status = 'done', 1, null)) as doneTasks")->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on("t1.project = t2.id") ->leftJoin(TABLE_EXECUTION)->alias('t3')->on("t1.execution = t3.id") ->leftJoin(TABLE_TASKTEAM)->alias('t4')->on("t4.task = t1.id and t4.account = '{$this->app->user->account}'") diff --git a/module/block/view/flowchart.html.php b/module/block/view/flowchart.html.php index aa48f8fe25..2d25032598 100644 --- a/module/block/view/flowchart.html.php +++ b/module/block/view/flowchart.html.php @@ -10,7 +10,7 @@