diff --git a/VERSION b/VERSION index e20da793b8..0c7b82c8ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.5 +16.5.beta1 diff --git a/config/config.php b/config/config.php index 6271d1a45d..c3344b02bd 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 = '16.5'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '16.5.beta1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->liteVersion = '1.0'; // 迅捷版版本。 The version of Lite. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. diff --git a/db/standard/zentao16.5.sql b/db/standard/zentao16.5.beta1.sql similarity index 100% rename from db/standard/zentao16.5.sql rename to db/standard/zentao16.5.beta1.sql diff --git a/db/update16.4.sql b/db/update16.4.sql index 8f1614a65e..b807f73ccc 100644 --- a/db/update16.4.sql +++ b/db/update16.4.sql @@ -11,7 +11,7 @@ ALTER TABLE `zt_doc` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; ALTER TABLE `zt_doclib` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `type`; ALTER TABLE `zt_action` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `read`; ALTER TABLE `zt_searchindex` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; -ALTER TABLE `zt_config` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; +ALTER TABLE `zt_config` ADD `vision` varchar(10) NOT NULL DEFAULT '' AFTER `id`; ALTER TABLE `zt_config` DROP INDEX `unique`, ADD UNIQUE `unique` (`vision`,`owner`,`module`,`section`,`key`); ALTER TABLE `zt_todo` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`; ALTER TABLE `zt_block` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `account`; @@ -59,4 +59,5 @@ ALTER TABLE `zt_projectstory` CHANGE `branch` `branch` mediumint unsigned NOT NU INSERT INTO `zt_config` (`vision`,`owner`, `module`, `section`, `key`, `value`) VALUES ('lite','system', 'project', '', 'unitList', 'CNY,USD'); INSERT INTO `zt_config` (`vision`,`owner`, `module`, `section`, `key`, `value`) VALUES ('lite','system', 'project', '', 'defaultCurrency', 'CNY'); -ALTER TABLE `zt_apistruct` CHANGE `desc` `desc` text COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `type`; \ No newline at end of file +ALTER TABLE `zt_apistruct` CHANGE `desc` `desc` text COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `type`; +ALTER TABLE `zt_review` ADD `doc` mediumint NULL AFTER `template`; diff --git a/db/zentao.sql b/db/zentao.sql index 9ed1eaef89..e24d955539 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -359,7 +359,7 @@ CREATE TABLE IF NOT EXISTS `zt_compile` ( -- DROP TABLE IF EXISTS `zt_config`; CREATE TABLE IF NOT EXISTS `zt_config` ( `id` mediumint(8) unsigned NOT NULL auto_increment, - `vision` varchar(10) NOT NULL DEFAULT 'rnd', + `vision` varchar(10) NOT NULL DEFAULT '', `owner` char(30) NOT NULL default '', `module` varchar(30) NOT NULL, `section` char(30) NOT NULL default '', diff --git a/module/group/model.php b/module/group/model.php index 844df156e5..57fb95c554 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -219,6 +219,7 @@ class groupModel extends model ->from(TABLE_USERGROUP)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account') ->where('`group`')->eq((int)$groupID) + ->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi() ->andWhere('t2.deleted')->eq(0) ->orderBy('t2.account') ->fetchPairs(); diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index e569fa2162..6081f31c5e 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -97,7 +97,7 @@ $lang->misc->feature->themeDesc = '

ZenTao 15.0+ a new "Youth Blue" theme $lang->misc->feature->visionsDesc = "

The concept of interface has been added since 16.5. Users can deal with R & D affairs in [R&D] and daily office affairs in [Lite].

You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.

"; $lang->misc->feature->visionsImage = 'theme/default/images/main/visions.png'; -$lang->misc->releaseDate['16.5'] = '2022-02-22'; +$lang->misc->releaseDate['16.5.beta1'] = '2022-03-16'; $lang->misc->releaseDate['16.4'] = '2022-02-15'; $lang->misc->releaseDate['16.3'] = '2022-01-26'; $lang->misc->releaseDate['16.2'] = '2022-01-17'; @@ -172,7 +172,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; -$lang->misc->feature->all['16.5'][] = array('title' => 'Fix bug, merge all code to one package', 'desc' => ''); +$lang->misc->feature->all['16.5.beta1'][] = array('title' => 'Fix bug, merge all code to one package', 'desc' => ''); $lang->misc->feature->all['16.4'][] = array('title' => 'Implement JIRA import function and improve plug-in extension mechanism.', 'desc' => ''); $lang->misc->feature->all['16.3'][] = array('title' => 'Kanban adds related plan/release/version/iteration functions, and the detail experience is optimized, fix bugs.', 'desc' => ''); $lang->misc->feature->all['16.2'][] = array('title' => 'Add kanban model project, fix bugs.', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 6ac6d80265..7fdcc84c52 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -97,7 +97,7 @@ $lang->misc->feature->themeDesc = "

禅道15系列上线了全新的“ $lang->misc->feature->visionsDesc = "

从16.5开始增加了界面概念,用户可以在[研发综合界面]中处理研发事务、在[迅捷界面]处理日常办公事务。

在头像右侧即可查看当前所处界面,点击当前界面名称可查看和切换其他的界面。

"; $lang->misc->feature->visionsImage = 'theme/default/images/main/visions.png'; -$lang->misc->releaseDate['16.5'] = '2022-02-22'; +$lang->misc->releaseDate['16.5.beta1'] = '2022-03-16'; $lang->misc->releaseDate['16.4'] = '2022-02-15'; $lang->misc->releaseDate['16.3'] = '2022-01-26'; $lang->misc->releaseDate['16.2'] = '2022-01-17'; @@ -172,7 +172,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; -$lang->misc->feature->all['16.5'][] = array('title' => '实现一码多面,多个禅道版本集成到一个包中。', 'desc' => ''); +$lang->misc->feature->all['16.5.beta1'][] = array('title' => '将禅道收费版和开源版集成到一个包中,优化升级步骤。', 'desc' => ''); $lang->misc->feature->all['16.4'][] = array('title' => '实现JIRA导入功能,完善插件扩展机制。', 'desc' => ''); $lang->misc->feature->all['16.3'][] = array('title' => '看板增加关联计划/发布/版本/迭代功能,细节体验优化。', 'desc' => ''); $lang->misc->feature->all['16.2'][] = array('title' => '新增专业研发看板,可以创建看板模型项目,修复Bug。', 'desc' => ''); diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 5c52446040..efc038415a 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -151,6 +151,7 @@ #programTableList .icon-project:before {content: '\e99c';} #programTableList .icon-scrum:before {content: '\e9a2';} #programTableList .icon-waterfall:before {content: '\e9a4';} +#programTableList .icon-kanban:before {content: '\e983';}