From 19f9fa2571e3edd539f19f4c74c433b4400937c0 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 1 Jan 2021 09:12:03 +0800
Subject: [PATCH] * Fix details.

---
 db/update20.0.alpha.sql               |  2 +-
 db/update20.0.beta2.sql               |  1 +
 module/common/lang/menuOrder.php      | 10 +++++-----
 module/common/lang/zh-cn.php          |  2 +-
 module/common/view/datatable.html.php |  2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/db/update20.0.alpha.sql b/db/update20.0.alpha.sql
index 3992047afa..cc061a99a2 100644
--- a/db/update20.0.alpha.sql
+++ b/db/update20.0.alpha.sql
@@ -6,7 +6,7 @@ ALTER TABLE `zt_project` CHANGE `acl` `acl` char(30) NOT NULL DEFAULT 'open';
 ALTER TABLE `zt_project` ADD `product` varchar(20) NOT NULL DEFAULT 'single' AFTER `type`;
 ALTER TABLE `zt_project` ADD `lifetime` char(30) NOT NULL AFTER `product`;
 ALTER TABLE `zt_project` ADD `budget` varchar(30) NOT NULL DEFAULT '0' AFTER `lifetime`;
-ALTER TABLE `zt_project` ADD `budgetUnit` char(30) NOT NULL  DEFAULT 'wanyuan' AFTER `budget`;
+ALTER TABLE `zt_project` ADD `budgetUnit` char(30) NOT NULL DEFAULT 'yuan' AFTER `budget`;
 ALTER TABLE `zt_project` ADD `percent` float unsigned NOT NULL DEFAULT '0' AFTER `budgetUnit`;
 ALTER TABLE `zt_project` ADD `path` varchar(255) NOT NULL AFTER `parent`;
 ALTER TABLE `zt_project` ADD `grade` tinyint unsigned NOT NULL AFTER `path`;
diff --git a/db/update20.0.beta2.sql b/db/update20.0.beta2.sql
index 79567aeeb7..35ce9466a6 100644
--- a/db/update20.0.beta2.sql
+++ b/db/update20.0.beta2.sql
@@ -2,3 +2,4 @@ ALTER TABLE `zt_risk` add `closedBy` char(30) AFTER `assignedTo`;
 ALTER TABLE `zt_risk` add `closedDate` date AFTER `closedBy`;
 ALTER TABLE `zt_issue` CHANGE `closeBy` `closedBy` char(30);
 ALTER TABLE `zt_repo` CHANGE `PRJ` `product` varchar(255) NOT NULL AFTER `id`;
+ALTER TABLE `zt_project` CHANGE `budgetUnit` `budgetUnit` char(30) NOT NULL  DEFAULT 'wanyuan' AFTER `budget`;
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 452f4463d1..39180770dd 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -51,13 +51,13 @@ $lang->todo->menuOrder = $lang->my->menuOrder;
 $lang->product->menuOrder[5]  = 'view';
 $lang->product->menuOrder[10] = 'requirement';
 $lang->product->menuOrder[15] = 'story';
-$lang->product->menuOrder[20] = 'plan';
-$lang->product->menuOrder[25] = 'track';
+$lang->product->menuOrder[20] = 'track';
+$lang->product->menuOrder[25] = 'plan';
 $lang->product->menuOrder[30] = 'release';
 $lang->product->menuOrder[35] = 'roadmap';
-$lang->product->menuOrder[40] = 'dynamic';
-$lang->product->menuOrder[45] = 'project';
-$lang->product->menuOrder[50] = 'doc';
+$lang->product->menuOrder[40] = 'project';
+$lang->product->menuOrder[45] = 'doc';
+$lang->product->menuOrder[50] = 'dynamic';
 $lang->product->menuOrder[55] = 'setting';
 $lang->product->menuOrder[60] = 'create';
 $lang->product->menuOrder[65] = 'all';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 26112e904f..bfd258b0c6 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -318,7 +318,7 @@ $lang->scrumproduct->menu->view    = array('link' => '概况|product|view|produc
 $lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
 $lang->scrumproduct->menu->story       = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
-$lang->product->dividerMenu = ',project,doc,';
+$lang->product->dividerMenu = ',requirement,plan,project,';
 
 $lang->story = new stdclass();
 
diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php
index 412962dc67..9fea3a1523 100644
--- a/module/common/view/datatable.html.php
+++ b/module/common/view/datatable.html.php
@@ -43,7 +43,7 @@ var datatableOptions =
     tableClass    : 'tablesorter',
     storage       : false,
     fixCellHeight : false,
-    selectable     : false,
+    selectable    : false,
     fixedHeader: true,
     ready: function()
     {