diff --git a/VERSION b/VERSION index 072e6075b0..aca1f7a170 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.0.beta +10.0.alpha diff --git a/config/config.php b/config/config.php index 29b8779a8b..e0fdaa0492 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '10.0.beta'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '10.0.alpha'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. $config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php. diff --git a/db/update10.0.beta.sql b/db/update9.8.3.sql similarity index 79% rename from db/update10.0.beta.sql rename to db/update9.8.3.sql index 6c07ea7c58..bf3057b7ea 100644 --- a/db/update10.0.beta.sql +++ b/db/update9.8.3.sql @@ -1,5 +1,4 @@ ALTER TABLE `zt_release` ADD `marker` enum('0','1') NOT NULL default '0' AFTER `name`; ALTER TABLE `zt_doc` ADD `collector` text NOT NULL AFTER `views`; -ALTER TABLE `zt_doc` ADD `visitedDate` datetime NOT NULL AFTER `editedDate`; ALTER TABLE `zt_doclib` ADD `collector` text NOT NULL AFTER `main`; ALTER TABLE `zt_module` ADD `collector` text NOT NULL AFTER `owner`; diff --git a/db/zentao.sql b/db/zentao.sql index 21e3a6ddb1..9322e1dfcf 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -260,7 +260,6 @@ CREATE TABLE IF NOT EXISTS `zt_doc` ( `addedDate` datetime NOT NULL, `editedBy` varchar(30) NOT NULL, `editedDate` datetime NOT NULL, - `visitedDate` datetime NOT NULL, `acl` varchar(10) NOT NULL DEFAULT 'open', `groups` varchar(255) NOT NULL, `users` text NOT NULL, @@ -292,6 +291,7 @@ CREATE TABLE IF NOT EXISTS `zt_doclib` ( `groups` varchar(255) NOT NULL, `users` text NOT NULL, `main` enum('0','1') NOT NULL default '0', + `collector` text NOT NULL, `order` tinyint(5) unsigned NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`) @@ -404,6 +404,7 @@ CREATE TABLE IF NOT EXISTS `zt_module` ( `order` smallint(5) unsigned NOT NULL default '0', `type` char(30) NOT NULL, `owner` varchar(30) NOT NULL, + `collector` text NOT NULL, `short` varchar(30) NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), @@ -1109,6 +1110,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'my', 'testCase'), (1, 'my', 'testTask'), (1, 'my', 'todo'), +(1, 'my', 'calendar'), (1, 'my', 'unbind'), (1, 'my', 'manageContacts'), (1, 'my', 'deleteContacts'), @@ -1421,6 +1423,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'my', 'story'), (2, 'my', 'task'), (2, 'my', 'todo'), +(2, 'my', 'calendar'), (2, 'my', 'unbind'), (2, 'my', 'manageContacts'), (2, 'my', 'deleteContacts'), @@ -1605,6 +1608,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3, 'my', 'testCase'), (3, 'my', 'testTask'), (3, 'my', 'todo'), +(3, 'my', 'calendar'), (3, 'my', 'unbind'), (3, 'my', 'manageContacts'), (3, 'my', 'deleteContacts'), @@ -1844,6 +1848,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'my', 'testCase'), (4, 'my', 'testTask'), (4, 'my', 'todo'), +(4, 'my', 'calendar'), (4, 'my', 'unbind'), (4, 'my', 'manageContacts'), (4, 'my', 'deleteContacts'), @@ -2070,6 +2075,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'my', 'testCase'), (5, 'my', 'testTask'), (5, 'my', 'todo'), +(5, 'my', 'calendar'), (5, 'my', 'unbind'), (5, 'my', 'manageContacts'), (5, 'my', 'deleteContacts'), @@ -2342,6 +2348,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'my', 'testCase'), (6, 'my', 'testTask'), (6, 'my', 'todo'), +(6, 'my', 'calendar'), (6, 'my', 'unbind'), (6, 'my', 'manageContacts'), (6, 'my', 'deleteContacts'), @@ -2566,6 +2573,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'my', 'testCase'), (7, 'my', 'testTask'), (7, 'my', 'todo'), +(7, 'my', 'calendar'), (7, 'my', 'unbind'), (7, 'my', 'manageContacts'), (7, 'my', 'deleteContacts'), @@ -2816,6 +2824,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'my', 'testCase'), (8, 'my', 'testTask'), (8, 'my', 'todo'), +(8, 'my', 'calendar'), (8, 'my', 'unbind'), (8, 'my', 'manageContacts'), (8, 'my', 'deleteContacts'), @@ -3054,6 +3063,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'my', 'testCase'), (9, 'my', 'testTask'), (9, 'my', 'todo'), +(9, 'my', 'calendar'), (9, 'my', 'unbind'), (9, 'my', 'manageContacts'), (9, 'my', 'deleteContacts'), @@ -3199,6 +3209,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10, 'my', 'profile'), (10, 'my', 'task'), (10, 'my', 'todo'), +(10, 'my', 'calendar'), (10, 'my', 'unbind'), (10, 'product', 'browse'), (10, 'product', 'doc'), diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index e0e96516a0..5e86cb74ce 100644 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -15,7 +15,7 @@