Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' into 'sprint_273_79667'

Browse Source 
# Conflicts:
#   module/story/lang/de.php
#   module/story/lang/en.php
#   module/story/lang/fr.php
#   module/story/lang/zh-cn.php
This commit is contained in:
孙广明
2022-12-15 05:30:51 +00:00
parent b9d86da835 7e7ec61d7e
commit dc7d8a5500
59 changed files with 4860 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
18.0.beta1
18.0.beta2
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '18.0.beta1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '18.0.beta2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
db/standard/zentao18.0.beta2.sql
+4084
View File
File diff suppressed because it is too large Load Diff
db/update18.0.beta1.sql
+2 -2
View File
@@ -1,6 +1,6 @@
ALTER TABLE `zt_story` ADD COLUMN `twins` varchar(255) NOT NULL AFTER `linkRequirements`;
ALTER TABLE `zt_productplan` MODIFY COLUMN `branch` varchar(255) NOT NULL DEFAULT '0';
ALTER TABLE `zt_productplan` MODIFY COLUMN `branch` varchar(255) NOT NULL DEFAULT '0' AFTER `product`;
ALTER TABLE `zt_effort` ADD `extra` text COLLATE 'utf8_general_ci' NOT NULL AFTER `end`;
ALTER TABLE `zt_build` MODIFY COLUMN `branch` varchar(255) NOT NULL DEFAULT '0';
ALTER TABLE `zt_build` MODIFY COLUMN `branch` varchar(255) NOT NULL DEFAULT '0' AFTER `product`;
ALTER TABLE `zt_feedback` ADD COLUMN `activatedBy` varchar(30) NOT NULL AFTER `assignedDate`;
ALTER TABLE `zt_feedback` ADD COLUMN `activatedDate` datetime NOT NULL AFTER `activatedBy`;
db/zentao.sql
+3 -1
View File
@@ -6400,7 +6400,7 @@ CREATE TABLE IF NOT EXISTS `zt_im_message` (
`user` varchar(30) NOT NULL DEFAULT '',
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`index` int(11) unsigned NOT NULL DEFAULT 0,
`type` enum('normal', 'broadcast', 'notify', 'bulletin') NOT NULL DEFAULT 'normal',
`type` enum('normal','broadcast','notify','bulletin','botcommand') NOT NULL DEFAULT 'normal',
`content` text NOT NULL DEFAULT '',
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
`data` text NOT NULL DEFAULT '',
@@ -7129,6 +7129,8 @@ CREATE TABLE IF NOT EXISTS `zt_feedback` (
`editedDate` datetime NOT NULL,
`assignedTo` varchar(255) NOT NULL,
`assignedDate` datetime NOT NULL,
`activatedBy` varchar(30) NOT NULL,
`activatedDate` datetime NOT NULL,
`feedbackBy` varchar(100) NOT NULL,
`repeatFeedback` mediumint(8) NOT NULL DEFAULT 0,
`mailto` varchar(255) NOT NULL,
doc/CHANGELOG
+199
View File
@@ -1,3 +1,202 @@
2022-12-14 18.0.beta2
完成的需求
开源版：
41067 初始化执行节点时可以安装单个服务
41056 孪生需求编辑的时候一直显示解除的icon
41054 需求批量关闭页面增加孪生需求标签
41046 孪生需求关闭时，支持解除孪生关系
41045 优化按计划导入时提示语
41044 孪生需求不支持细分
41043 变更页面支持解除孪生关系
41042 孪生需求变更页面中同步孪生需求区块调整至影响范围
41021 计划关联的bug列表字段顺序调整
41020 计划关联的研发需求列表字段顺序调整
41018 发布关联的遗留bug列表字段顺序调整
41016 版本关联的解决的bug列表字段顺序调整
41015 发布中关联的解决的bug列表字段顺序调整
41014 版本中关联的研发需求列表字段顺序调整
41013 发布中关联的研发需求列表字段顺序调整
41011 产品发布列表部分字段列宽调整
41008 优化执行节点的远程管理页面
40984 需求变更时的确认按钮改为ok样式
40887 创建任务页优化多人任务设置
40874 未开始的任务支持切换单人或多人任务
40862 父计划支持编辑分支
40837 集成版本始终保留自身关联的需求和bug所对应的分支
40717 测试单可以关联版本对应分支的用例
40713 发布归属多个分支时，路线图中在不同分支重复展示
40712 计划列表的”平台/分支“搜索条件关于默认为”包含“。
40711 项目的需求列表中按计划导入需求时，修改提示语
40710 发布的列表页中，版本后面展示所属分支
40709 发布的详情页中，所属分支展示关联版本的分支的合集
40700 执行中创建版本时，所属分支支持多选
40691 执行的需求列表中按计划导入需求时，修改提示语
40649 优化多分支产品创建计划的逻辑
40648 版本列表中增加所属分支字段
40646 项目的发布去掉分支字段
40644 多分支产品修改计划的分支时，同步移除对应分支的bug
40615 优化创建执行节点的交互
40524 批量执行自动化用例
40358 在宿主机列表添加初始化的引导
40352 优化初始化宿主机的交互
40350 优化创建宿主机的交互
40132 需求详情页中用户需求部分交互优化
39893 编辑执行节点
39773 主干需求的计划只能选择一个
39772 详情页面和编辑页面的孪生需求样式优化
39766 项目页面优化分支关联样式
39763 执行页面优化分支关联样式
39699 多分支产品1.5级菜单选所有时，隐藏批量修改模块按钮
39657 浏览创建镜像进度
39656 取消下载镜像
39653 优化下载镜像的交互
39636 浏览镜像仓库
39602 孪生需求进行提交评审、撤销评审、撤销变更时，其余孪生需求均同步
39601 多分支需求批量修改计划时，只能修改至对应分支的计划
39600 勾选软件需求后进行批量编辑时，过滤掉孪生需求
39599 孪生需求进行批量评审时，其余孪生需求均同步评审结果
39575 瀑布项目阶段列表中细分按钮置灰逻辑完善
39573 孪生需求进行批量关闭时，其余孪生需求均同步关闭
39570 孪生需求进行批量指派给时，其余孪生需求均同步修改
39568 研发需求批量修改指派给时过滤已关闭的需求
39566 有执行节点的宿主机不能删除
39564 浏览宿主机详情
39562 需求批量修改阶段时修改提示语
39558 创建孪生需求时相同分支只能选一次
39448 编辑和变更孪生需求时，同步需求内容
39445 孪生需求激活时，状态同步
39436 孪生需求关闭时，状态同步
39435 孪生需求指派时，指派人同步
39424 孪生需求的产品进行切换后，解除孪生关系
39423 复制需求时不复制孪生关系
39422 孪生需求的变更页面中“影响范围”展示所有相关需求的影响范围
39421 修改子计划分支时，只能在父计划的分支内选择
39416 变更和编辑孪生需求时可以解除孪生关系
39353 编写更新镜像下载状态的接口
39302 币种设置中“台元”调整为”台币“
39269 根据提供的ostype文件表的结构维护操作系统
39224 初始化宿主机
39196 编辑和变更孪生需求时增加同步的提示信息
39177 基于执行节点创建镜像
39150 宿主机网络连通性检验常用端口
39148 编写初始化宿主机脚本
39145 从镜像创建执行节点
39143 宿主机列表添加初始化按钮
39142 调整添加和编辑执行节点页面控件
39141 调整添加和编辑执行节点页面的样式
39138 调整添加和编辑宿主机页面控件
39085 下载镜像
39084 调整添加和编辑宿主机表单样式
39083 调整测试下二级导航栏
38958 解除多分支需求的孪生关系后，需求不再同步
38956 孪生需求评审时，评审的流程及状态同步
38654 优化创建项目页产品和计划的选择样式
38653 优化创建执行页产品和计划的选择样式
38645 执行按计划关联需求时，只关联本执行所关联分支的激活需求
38486 初始化执行节点
38482 用例列表添加自动化测试设置
38459 项目按计划关联需求时，只关联本项目所关联分支的激活需求
38373 孪生需求详情页中展示其余孪生需求
38233 创建执行时可关联计划的范围需根据分支过滤
38232 创建项目时可关联计划的范围需根据分支过滤
37968 版本多选分支后，关联需求和bug只能关联分支内的
37966 项目中创建版本时，所属分支支持多选
37958 产品计划看板中，属于多个分支的计划多次展示
37957 计划多选分支后，关联需求和bug只能关联分支内的
37955 创建计划时，所属分支支持多选
37818 禅道向执行节点发送请求时带上token
37618 浏览执行节点详情
37614 查看自动化用例执行结果
37611 执行自动化用例
36993 通过NoVNC远程操控执行节点
36991 实现删除执行节点的功能
36987 实现重启执行节点的功能
36986 实现恢复执行节点的功能
36985 实现暂停执行节点的功能
36980 实现基于宿主机添加执行节点的功能
36978 在测试自动化下增加执行节点列表页面
36965 实现删除宿主机的功能
36963 实现编辑宿主机的功能
34485 批量提用例页面自定义表单不选择分支时，所属模块展示“主干”的模块
34484 批量提bug页面自定义表单不选择分支时，所属模块展示“主干”的模块
31514 多分支产品维护模块时上级模块要跟随所属产品分支联动
30874 创建需求时，所属分支可以多选
企业版：
40541 上传课程支持断点续传功能
39945 课程中可以替换需要修正的视频
39691 课程中可以上传新视频
39652 视频无法播放时给出提示
38978 课程上传组件支持批量上传功能
36843 调整系统备份逻辑不备份学堂数据
旗舰版：
40764 我的地盘审批列表过滤掉无数据的对象标签
39800 调整瀑布项目计划区块的阶段进度计算公式
39308 对瀑布类型项目进行评审时填报的工时可以记录到日志中
37519 地盘审批列表可以展示在工作流中配置的审批流
34166 消息通知增加审批流相关的通知设置
禅道客户端：
37925 实现原小喧喧以一对一会话的形式展示
37930 实现机器人会话消息显示顺序调整
37960 实现机器人会话消息右键菜单操作
37959 实现在消息记录窗口中查看小喧喧历史消息
37948 实现机器人会话在最近会话列表的提醒展示
38620 实现机器人会话指令机制
38500 实现内置应用查看服务器基础信息demo指令设计
38519 实现内置应用查看企业授权信息demo指令设计
38526 实现内置应用查看人员信息demo指令设计
38529 实现内置提示音开关demo指令设计
38438 实现查询指令特殊情况下的默认回复
39186 实现会话列表中会议中、连接会议图标的干扰
38688 实现机器人会话自动识错功能
38426 实现查询任务指令结果以详情形式展示
38406 实现通过任务指派人过滤任务的指令格式设计
38646 实现机器人会话指令与禅道协同的机制
38497 实现机器人会话应用选择
38432 实现对话机器人查询任务指令的全局设计
38421 实现查询任务指令结果以列表展示
38407 实现通过任务优先级过滤任务的指令格式设计
38409 实现引导帮助指令设计
39261 实现查询任务显示列表增加快速操作任务的按钮设计
38959 实现机器人会话操作任务指令与禅道协同的机制
38961 实现对话机器人操作任务指令的全局设计
39021 实现对话机器人指令开始禅道任务的设计
39026 实现对话机器人指令完成禅道任务的设计
38970 实现对话机器人指令关闭禅道任务的设计
39180 实现群管理应用中合并群组时可以通过关键字进行搜索
39181 实现加载会话消息记录的功能
39187 实现图片查看时工具栏的优化显示
39182 实现xxb后台用户默认职位角色可以删除操作
39184 优化图片另存为浮窗交互显示
39183 删除解散后的讨论组的相关操作
解决的bug:
24883 同时打开多个页签情况下出现页签导航和实际功能混乱情况
29140 wiki编辑章节可以选择自身，保存会出问题
29143 k8s环境替换正式授权之后频繁出现获取uid失败的提示
29423 透视表中的部分报表状态显示的是英文
30275 在反馈的历史记录中点击转的任务会跳转到执行下
30539 工作流导入日期显示1970-01-01
30548 用例导入页面输入框与字段错位显示
30685 通过上传导入图片的文档导出无反应
30700 创建工单无法选择“所属模块”了
27979 地盘会议列表中添加会议页面不选择所属项目和执行，会议列表中不显示无所属项目和执行的会议
28014 禅道客户端聊天中从自己的会话无法查看聊天记录
27983 用户名大小写不对，提示有问题
27629 预览txt文件乱码
27628 喧喧查看大图后复制和另存为看不清楚（Mac用户）
26559 最小窗口时群成员管理列表样式错误
28637 已撤回的文件在侧边栏的文件列表中还显示
28540 某些窗口无法正常弹出
28512 客户端登录账号后一两分钟就提示账号被禁用，但后台账号状态正常
28394 客户端导出模板，导入样式显示有问题
28095 LDAP密码有特殊字符无法登录
25192 多人快速发送消息时会出现index相同的情况
14863 使用第三方截图工具截图后，有时在喧喧输入框中粘贴不上
29037 bug指派无法弹窗
29029 回复消息最后一层信息没有居左对齐
28905 聊天发送图片，图片形状编写失真
28529 macos客户端页面渲染异常
28297 禅道客户端更新工时弹窗出现遮挡
2022-11-16 18.0.beta1
完成的需求
开源版:
module/action/model.php
+5
View File
@@ -1842,6 +1842,11 @@ class actionModel extends model
}
}
}
elseif($action->objectType == 'release')
{
$release = $this->dao->select('*')->from(TABLE_RELEASE)->where('id')->eq($action->objectID)->fetch();
if($release->shadow) $this->dao->update(TABLE_BUILD)->set('deleted')->eq(0)->where('id')->eq($release->shadow)->exec();
}
/* Update deleted field in object table. */
$table = $this->config->objectTables[$action->objectType];
module/bug/control.php
+6 -4
View File
@@ -2350,21 +2350,23 @@ class bug extends control
$this->config->bug->datatable->fieldList['module']['dataSource']['method'] = 'getAllModulePairs';
$this->config->bug->datatable->fieldList['module']['dataSource']['params'] = 'bug';
$this->config->bug->datatable->fieldList['project']['dataSource'] = array('module' => 'project', 'method' => 'getPairsByIdList', 'params' => $executionID);
$this->config->bug->datatable->fieldList['execution']['dataSource'] = array('module' => 'execution', 'method' => 'getPairs', 'params' => $executionID);
$object = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
$projectID = $object->type == 'project' ? $object->id : $object->parent;
$this->config->bug->datatable->fieldList['project']['dataSource'] = array('module' => 'project', 'method' => 'getPairsByIdList', 'params' => $projectID);
$this->config->bug->datatable->fieldList['execution']['dataSource'] = array('module' => 'execution', 'method' => 'getPairs', 'params' => $projectID);
}
$this->transfer->export('bug');
$this->fetch('file', 'export2' . $_POST['fileType'], $_POST);
}
$product = $this->loadModel('product')->getByID($productID);
if($product->type == 'normal') $this->config->bug->exportFields = str_replace('branch,', '', $this->config->bug->exportFields);
if(isset($product->type) and $product->type == 'normal') $this->config->bug->exportFields = str_replace('branch,', '', $this->config->bug->exportFields);
if($this->app->tab == 'project' or $this->app->tab == 'execution')
{
$execution = $this->loadModel('execution')->getByID($executionID);
if(empty($execution->multiple)) $this->config->bug->exportFields = str_replace('execution,', '', $this->config->bug->exportFields);
if($product->shadow) $this->config->bug->exportFields = str_replace('product,', '', $this->config->bug->exportFields);
if(!empty($product->shadow)) $this->config->bug->exportFields = str_replace('product,', '', $this->config->bug->exportFields);
}
$fileName = $this->lang->bug->common;
module/build/control.php
+5 -4
View File
@@ -180,7 +180,7 @@ class build extends control
{
$productGroups = $this->product->getProducts($build->project);
$branches = $this->loadModel('branch')->getList($build->product, $build->project, 'all');
$builds = $this->build->getBuildPairs($build->product, $build->branch, 'noempty,notrunk,singled,separate', $build->project, 'project', $build->builds, false);
$builds = $this->build->getBuildPairs($build->product, 'all', 'noempty,notrunk,singled,separate', $build->project, 'project', $build->builds, false);
}
$executions = $this->product->getExecutionPairsByProduct($build->product, $build->branch, 'id_desc', $this->session->project, 'stagefilter');
@@ -876,9 +876,10 @@ class build extends control
}
else
{
$branchList = $this->loadModel('branch')->getPairs($build->product, '', $build->execution);
$branchAll = sprintf($this->lang->build->branchAll, $this->lang->product->branchName[$product->type]);
$branches = array('' => $branchAll, BRANCH_MAIN => $this->lang->branch->main);
$buildBranch = array();
$branchList = $this->loadModel('branch')->getPairs($build->product, '', $build->execution);
$branchAll = sprintf($this->lang->build->branchAll, $this->lang->product->branchName[$product->type]);
$branches = array('' => $branchAll, BRANCH_MAIN => $this->lang->branch->main);
if(strpos($build->branch, ',') !== false) $buildBranch = explode(',', $build->branch);
foreach($buildBranch as $buildKey) $branches += array($buildKey => zget($branchList, $buildKey));
module/build/css/view.css
+3 -1
View File
@@ -7,8 +7,10 @@
.body-modal #mainContent {min-height: 200px;}
td.article-content{overflow:auto !important;}
td.c-build{white-space: nowrap; overflow:hidden;}
th.c-user,td.c-user{text-align:left;}
#stories th, #stories td{padding-left:16px;}
#stories th, #stories td{padding-left:16px;padding-right:16px;}
#stories .c-build{width:160px; text-align:left}
#stories .c-estimate{width:90px; text-align:right}
#stories .c-status{width:120px}
#stories .c-stage{width:130px; text-align:left;}
module/build/lang/de.php
+5 -4
View File
@@ -66,13 +66,14 @@ $lang->build->notice->changeBuilds = "The version of the submitted test order
$lang->build->notice->autoRelation = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
$lang->build->notice->createTest = "The execution of this version has been deleted, and the test cannot be submitted";
$lang->build->finishStories = " %s {$lang->SRCommon} sind abgeschlossen.";
$lang->build->resolvedBugs = ' %s Bugs sind gelöst.';
$lang->build->createdBugs = ' %s Bugs wurden erstellt.';
$lang->build->confirmChangeBuild = "After branch『%s』disassociation,under the %s have %s {$lang->SRCommon} and %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveStory = "After branch『%s』disassociation,under the %s have %s {$lang->SRCommon} will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveBug = "After branch『%s』disassociation,under the %s have %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveTips = "Are you sure to delete %s『%s』?";
$lang->build->finishStories = " %s {$lang->SRCommon} sind abgeschlossen.";
$lang->build->resolvedBugs = ' %s Bugs sind gelöst.';
$lang->build->createdBugs = ' %s Bugs wurden erstellt.';
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Source code repository, z.B. Subversion/Git Pfad';
module/build/lang/en.php
+5 -4
View File
@@ -66,13 +66,14 @@ $lang->build->notice->changeBuilds = "The version of the submitted test order
$lang->build->notice->autoRelation = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
$lang->build->notice->createTest = "The execution of this version has been deleted, and the test cannot be submitted";
$lang->build->finishStories = " Finished {$lang->SRCommon} %s";
$lang->build->resolvedBugs = ' Resolved Bug %s';
$lang->build->createdBugs = ' Reported Bug %s';
$lang->build->confirmChangeBuild = "After branch『%s』disassociation,under the %s have %s {$lang->SRCommon} and %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveStory = "After branch『%s』disassociation,under the %s have %s {$lang->SRCommon} will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveBug = "After branch『%s』disassociation,under the %s have %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveTips = "Are you sure to delete %s『%s』?";
$lang->build->finishStories = " Finished {$lang->SRCommon} %s";
$lang->build->resolvedBugs = ' Resolved Bug %s';
$lang->build->createdBugs = ' Reported Bug %s';
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Source code repository, e.g. Subversion/Git Library path';
module/build/lang/fr.php
+5 -4
View File
@@ -66,13 +66,14 @@ $lang->build->notice->changeBuilds = "The version of the submitted test order
$lang->build->notice->autoRelation = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
$lang->build->notice->createTest = "The execution of this version has been deleted, and the test cannot be submitted";
$lang->build->finishStories = " {$lang->SRCommon} Terminées %s";
$lang->build->resolvedBugs = ' Bugs Résolus %s';
$lang->build->createdBugs = ' Bugs Signalés %s';
$lang->build->confirmChangeBuild = "After branch『%s』disassociation,under the %s have %s {$lang->SRCommon} and %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveStory = "After branch『%s』disassociation,under the %s have %s {$lang->SRCommon} will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveBug = "After branch『%s』disassociation,under the %s have %s Bug will remove synchronization from version, whether to cancel？";
$lang->build->confirmRemoveTips = "Are you sure to delete %s『%s』?";
$lang->build->finishStories = " {$lang->SRCommon} Terminées %s";
$lang->build->resolvedBugs = ' Bugs Résolus %s';
$lang->build->createdBugs = ' Bugs Signalés %s';
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Répertoire des codes sources, ex: chemin de la bibliothèque Subversion / GitSource';
module/build/model.php
+40
View File
@@ -456,6 +456,46 @@ class buildModel extends model
->remove('allchecker,resolvedBy,files,labels,uid')
->get();
if(empty($oldBuild->execution))
{
$buildBranch = array();
foreach(explode(',', trim($build->branch, ',')) as $branchID) $buildBranch[$branchID] = $branchID;
/* Get delete builds. */
$deleteBuilds = array();
foreach(explode(',', $oldBuild->builds) as $oldBuildID)
{
if(empty($oldBuildID)) continue;
if(strpos(",$newBuilds,", ",$oldBuildID,") === false) $deleteBuilds[$oldBuildID] = $oldBuildID;
}
/* Delete the branch when the branch of the deleted build has no linked stories. */
$deleteBuildBranches = $this->dao->select('branch')->from(TABLE_BUILD)->where('id')->in($deleteBuilds)->fetchPairs();
$linkedStoryBranches = $this->dao->select('branch')->from(TABLE_STORY)->where('id')->in($oldBuild->stories)->fetchPairs('branch');
foreach($deleteBuildBranches as $deleteBuildBranch)
{
foreach(explode(',', $deleteBuildBranch) as $deleteBuildBranchID)
{
if(empty($deleteBuildBranchID) or isset($linkedStoryBranches[$deleteBuildBranchID])) continue;
unset($buildBranch[$deleteBuildBranchID]);
}
}
/* Add branch of new builds. */
$newBuilds = isset($build->builds) ? $build->builds : '';
$newBuildBranches = $this->dao->select('branch')->from(TABLE_BUILD)->where('id')->in($newBuilds)->fetchPairs();
foreach($newBuildBranches as $newBuildBranch)
{
foreach(explode(',', $newBuildBranch) as $newBuildBranchID)
{
if(empty($newBuildBranchID)) continue;
if(!isset($buildBranch[$newBuildBranchID])) $buildBranch[$newBuildBranchID] = $newBuildBranchID;
}
}
$build->branch = implode(',', $buildBranch);
}
$product = $this->loadModel('product')->getByID($build->product);
if(!empty($product) and $product->type != 'normal' and !isset($_POST['branch']) and isset($_POST['product']))
{
module/build/view/view.html.php
+11 -11
View File
@@ -92,7 +92,7 @@ tbody tr td:first-child input {display: none;}
<th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<?php if($childBuilds):?>
<th class='c-build w-200px text-left'><?php echo $lang->build->linkedBuild;?></th>
<th class='c-build'><?php echo $lang->build->linkedBuild;?></th>
<?php endif;?>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-estimate'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
@@ -151,9 +151,9 @@ tbody tr td:first-child input {display: none;}
<span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
</td>
<?php if($childBuilds):?>
<td class='c-build text-left' title='<?php echo $buildName?>'><?php echo $buildName;?></td>
<td class='c-build' title='<?php echo $buildName?>'><?php echo $buildName;?></td>
<?php endif;?>
<td><?php echo zget($users, $story->openedBy);?></td>
<td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
<td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
<td class='c-stage'><?php echo $lang->story->stageList[$story->stage];?></td>
<td class='c-actions'>
@@ -254,10 +254,10 @@ tbody tr td:first-child input {display: none;}
<?php if($childBuilds):?>
<td class='c-build' title='<?php echo $buildName?>'><?php echo $buildName;?></td>
<?php endif;?>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);?></td>
<td class='c-user'><?php echo zget($users, $bug->openedBy);?></td>
<td class='c-date'><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
<td class='c-user'><?php echo zget($users, $bug->resolvedBy);?></td>
<td class='c-date'><?php echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);?></td>
<td class='c-actions'>
<?php
if($canBeChanged and common::hasPriv($module, 'unlinkBug'))
@@ -342,10 +342,10 @@ tbody tr td:first-child input {display: none;}
foreach(explode(',', $bug->openedBuild) as $buildID) $openedBuilds .= ($buildID == 'trunk' ? 'Trunk' : zget($buildPairs, $buildID, '')) . ' ';
?>
<td class='c-build' title='<?php echo $openedBuilds;?>'><?php echo $openedBuilds;?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);?></td>
<td class='c-user'><?php echo zget($users, $bug->openedBy);?></td>
<td class='c-date'><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
<td class='c-user'><?php echo zget($users, $bug->resolvedBy);?></td>
<td class='c-date'><?php echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);?></td>
</tr>
<?php endforeach;?>
</tbody>
module/common/model.php
+1 -3
View File
@@ -2486,9 +2486,7 @@ EOD;
}
catch(EndResponseException $endResponseException)
{
if($this->app->getViewType() == 'json' || (defined('RUN_MODE') && RUN_MODE == 'api')) die($endResponseException->getContent());
echo $endResponseException->getContent();
die($endResponseException->getContent());
}
}
module/convert/model.php
+4 -3
View File
@@ -41,12 +41,13 @@ class convertModel extends model
* Check database exits or not.
*
* @access public
* @return bool
* @return object|false
*/
public function dbExists($dbName = '')
{
$sql = "SHOW DATABASES like '{$dbName}'";
return $this->dbh->query($sql)->fetch();
$statement = $this->dbh->prepare('SHOW DATABASES like ?');
$statement->execute([$dbName]);
return $statement->fetch();
}
/**
module/execution/control.php
+13 -5
View File
@@ -4195,14 +4195,22 @@ class execution extends control
include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
}
$executionProductList = $this->loadModel('product')->getProducts($executionID);
$multiBranchProduct = false;
foreach($executionProductList as $executionProduct)
if($productID)
{
if($executionProduct->type != 'normal')
$product = $this->loadModel('product')->getByID($productID);
if($product->type != 'normal') $multiBranchProduct = true;
}
else
{
$executionProductList = $this->loadModel('product')->getProducts($executionID);
foreach($executionProductList as $executionProduct)
{
$multiBranchProduct = true;
break;
if($executionProduct->type != 'normal')
{
$multiBranchProduct = true;
break;
}
}
}
$importPlanStoryTips = $multiBranchProduct ? $this->lang->execution->haveBranchDraft : $this->lang->execution->haveDraft;
module/misc/lang/de.php
+2
View File
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
$lang->misc->releaseDate['18.0.beta2'] = '2022-12-14';
$lang->misc->releaseDate['18.0.beta1'] = '2022-11-16';
$lang->misc->releaseDate['17.8'] = '2022-11-02';
$lang->misc->releaseDate['17.7'] = '2022-10-19';
@@ -193,6 +194,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['18.0.beta2'][] = array('title' => "We have optimized the product with multi-branches/multi-platforms. It's supported to create siblings stories. It's possible for Plan, Build, and Release to link requirements or bugs beyond their parent branch. 5 BI big screens are newly added. ZenTao Client has implemented the robot chatting mechanism.", 'desc' => '');
$lang->misc->feature->all['18.0.beta1'][] = array('title' => "Multiple core processes in ZenTao are improved: A project without any product linked in is able to be created, as well as creating projects without sprints/iterations linked in; projects are able to link products beyond the father program; switch easily between ZenTao Lite mode and Full Lifecycle Management mode.", 'desc' => '');
$lang->misc->feature->all['17.8'][] = array('title' => "We have optimized the color of status in lists, as well as the dashboard color. At the same time, the page of the task effort has been improved.", 'desc' => '');
$lang->misc->feature->all['17.7'][] = array('title' => "The table is optimized in the transition version. At the same time, we have added the new feature of Work Order and get the Feedback features improved as well. Fix bugs.", 'desc' => '');
module/misc/lang/en.php
+2
View File
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
$lang->misc->releaseDate['18.0.beta2'] = '2022-12-14';
$lang->misc->releaseDate['18.0.beta1'] = '2022-11-16';
$lang->misc->releaseDate['17.8'] = '2022-11-02';
$lang->misc->releaseDate['17.7'] = '2022-10-19';
@@ -193,6 +194,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['18.0.beta2'][] = array('title' => "We have optimized the product with multi-branches/multi-platforms. It's supported to create siblings stories. It's possible for Plan, Build, and Release to link requirements or bugs beyond their parent branch. 5 BI big screens are newly added. ZenTao Client has implemented the robot chatting mechanism.", 'desc' => '');
$lang->misc->feature->all['18.0.beta1'][] = array('title' => "Multiple core processes in ZenTao are improved: A project without any product linked in is able to be created, as well as creating projects without sprints/iterations linked in; projects are able to link products beyond the father program; switch easily between ZenTao Lite mode and Full Lifecycle Management mode.", 'desc' => '');
$lang->misc->feature->all['17.8'][] = array('title' => "We have optimized the color of status in lists, as well as the dashboard color. At the same time, the page of the task effort has been improved.", 'desc' => '');
$lang->misc->feature->all['17.7'][] = array('title' => "The table is optimized in the transition version. At the same time, we have added the new feature of Work Order and get the Feedback features improved as well. Fix bugs.", 'desc' => '');
module/misc/lang/fr.php
+2
View File
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
$lang->misc->releaseDate['18.0.beta2'] = '2022-12-14';
$lang->misc->releaseDate['18.0.beta1'] = '2022-11-16';
$lang->misc->releaseDate['17.8'] = '2022-11-02';
$lang->misc->releaseDate['17.7'] = '2022-10-19';
@@ -193,6 +194,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['18.0.beta2'][] = array('title' => "We have optimized the product with multi-branches/multi-platforms. It's supported to create siblings stories. It's possible for Plan, Build, and Release to link requirements or bugs beyond their parent branch. 5 BI big screens are newly added. ZenTao Client has implemented the robot chatting mechanism.", 'desc' => '');
$lang->misc->feature->all['18.0.beta1'][] = array('title' => "Multiple core processes in ZenTao are improved: A project without any product linked in is able to be created, as well as creating projects without sprints/iterations linked in; projects are able to link products beyond the father program; switch easily between ZenTao Lite mode and Full Lifecycle Management mode.", 'desc' => '');
$lang->misc->feature->all['17.8'][] = array('title' => "We have optimized the color of status in lists, as well as the dashboard color. At the same time, the page of the task effort has been improved.", 'desc' => '');
$lang->misc->feature->all['17.7'][] = array('title' => "The table is optimized in the transition version. At the same time, we have added the new feature of Work Order and get the Feedback features improved as well. Fix bugs.", 'desc' => '');
module/misc/lang/zh-cn.php
+2
View File
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = "<p>禅道15系列上线了全新的“
$lang->misc->feature->visionsDesc = "<p>从16.5开始增加了界面概念，用户可以在<span style='color:#0c60e1'>[研发综合界面]</span>中处理研发事务、在<span style='color:#0c60e1'>[运营管理界面]</span>处理日常办公事务。</p><p>在头像右侧即可查看当前所处界面，点击当前界面名称可查看和切换其他的界面。</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions.png';
$lang->misc->releaseDate['18.0.beta2'] = '2022-12-14';
$lang->misc->releaseDate['18.0.beta1'] = '2022-11-16';
$lang->misc->releaseDate['17.8'] = '2022-11-02';
$lang->misc->releaseDate['17.7'] = '2022-10-19';
@@ -193,6 +194,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['18.0.beta2'][] = array('title' => '优化多分支/多平台产品，支持创建孪生需求，计划、版本、发布支持跨分支关联需求和bug，新增5个BI大屏，并且禅道客户端实现了机器人会话机制。', 'desc' => '');
$lang->misc->feature->all['18.0.beta1'][] = array('title' => '主要对禅道多项核心流程进行改进，新增项目型项目、无迭代项目；支持项目跨项目集关联产品；支持轻量管理模式和全生命周期管理模式进行切换。', 'desc' => '');
$lang->misc->feature->all['17.8'][] = array('title' => '列表状态颜色、仪表盘颜色的改版和任务日志页面的优化。', 'desc' => '');
$lang->misc->feature->all['17.7'][] = array('title' => '过渡版本表格优化完成。新增工单功能，优化了反馈功能。修复Bug。', 'desc' => '');
module/product/css/roadmap.css
+1
View File
@@ -8,3 +8,4 @@
.release-line > li:nth-child(even) > a {padding-bottom: 38px;}
.release-link-line {pointer-events: none; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA+YAAADiCAMAAAD0xy2eAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABOUExURUdwTOXl5eXl5ebm5ufn5+rq6u7u7unp6eXl5f///+Xl5eXl5efn5+Xl5eXl5eXl5ebm5uXl5eXl5ebm5ubm5ubm5uXl5ebm5uXl5eXl5Uh6G7kAAAAZdFJOUwDuuVQtFQwg1gXH+Dpzoq1CmIV7aEuOX+MTWsN0AAAGrUlEQVQYGe3ACbaYOHRF0SuQkETfw5v/RPNdLpMZZKWez5buVQBcu8zmJACO1WOwcAqAZ7kx66MAeNa+ZncnAI51t1kvAK7F/hEAAAAAAACA/xP93gmAZ6tZOKsAODb2ZuUSAM/aYtZEAXCsTsFs7gTAse4eigD4lqMAAAAAAMD/D09/CYBrvVl/CYBjdXrN+lUAHOumYNavAuBYNwWzTQA866ZwCYBvnQAAAAD8V7RHEgDParHhzgLg2NqYDXMUAMfiPJg1qwA4lu/BbBMAz7rjvQTAtyoAAOBG1wmAb1O4swB4NptZcwmAY3EbzN4pCYBfaSpmwywAnl2NNQLgW44CAABuZAHwLQ1lSgLg2BjMhuUSAL9q25jZu2cB8CsfxcweAfBsnYcsAL51AgAAboxL2wmAZ5vZMF9VANxKZ29mYRsFwK98FDN7swA4Fvc3VAHwLQsAALgxlSMKgGeNmZU9CoBb9dqCmb33KABu1XV7zSwJgGfjPQsAALixHlEAXJvN3u3qBMCtdXvNbGjOLABuxaO3H1EAHEvPUgQAANwYlycLgGe7mZX76gTAq3wuwcyGZsoC4FUd997MLgHwLLVbJwB/j7UTANeyDf2+dgLgVuwHMxv6fa0C4FR37b39WATAse66+0kA/h45CYBvjZX5yQLg1xLsR1imsQqATzVOy2s/kgA4lp+tEYC/R9rOsRMAx1r7UebjygLgU57mMtgvswC4VeNzN++hT0oC4FDVZ7ehLPe55ioAPu3BfhseAXCqi+2xNa9d+rTnFTsB8KLqH7Xq09iPoTTzngXApXNrSrBfRn1i7ATAlS5e5570KWbD2y/b8XQC4NJSgv2W9RljrgLgR5fH9tznqk8ws1D6ZTs6AXCp6d/B/lH1Oc52jakKgBcpj+156FPtt1B6AXCp27elKcHMgj5d6Zdtn55rzALgRcpRn2x/vPrUMaYqAP9hVZ8a1/Y87rnpG32y/Qhv38y7ALiU+xIG+6Xok5r5Ps52jbkTABe6PF5Pq89ofxR9upg7AXAiXc+0b0tT3kaf0cyGtzTLdgqAS2N5B/tHo09ctn162jGmKgAedDmu7Xnp09ofjT5dTFUAnEjtedzz0pd30+cxs/D2zXy3AuBSW4L9tumzzvdxtmvMnQC40OXxes5Vn8n+2PTpkgC4EZ9p35amvMOuz2QWSr/M9zQKgEtTsH/t+qzH2a4xVQFwoaY4Xs+0r/rs9lsopwC4tO7b0pcwmJ367KVftn16rjEJgBddTvrM9sejT46pCoATKY7tedxz06/6zGYWSr9sexQAl+4S7LdLn3Z6rpirAHiR4tieR9ansX+E0o8C4NJzz015BzMb9bmX7TjbMXcC4EaXx06fYv8aogC4NLbnvi19CZb06Usz38dzjVkA/Kj6X8H+SPpUAfAjxfWZ9rnp36pPCKWZ7+m5ogC4VAf7o+rTCYAjKa7PdM9Nr0+1UJr5ntoxC4BLebB/BQFwKsX1me6lb/RJ89HGKgB+jfZLae5zFACX0nk3xX5pBMCvGttjnvRJWQB8myw0e5sFwK0p2C+h2aMAOJXbvQlm1gqAZ/k6sgD8PfpmXzsB8KuzX8rWZgFwKrV3P9iPIgB+1fFoQi8AziV9qgA4d4bljALg2GY/3vnJAuBVfubXfryrAPgVzyVYFgDfogD8Per8JAHwbDWzfh+rAHiVpmYws7CcWQC8qtddzOwWAM/yuawCAABu9HPbCYBj2cyG5swC4FacevtR9lEA3ErPEswWAfCsrncrAADgxraPAuBZN5i921oFwK31fs0szG0nAG7FvZhZLwCe5ak/BAAA3FizAPj2WjmyAPjVzcHMyhEFwK16zcHMyiQAftVrCzYLgGt1jQIAAG7MRxYAz7KZ9VMWALfqNQcz66ckAG7VdhnM7BYAx2q7DKcA+NZ1AgAAXtSyjQLg2WVm7x4FwK94v2ZWpiwAfo1bMLNJAByr1zyMAuBbJwAA4EYsUxYAzw4za55OANyq1zKYDctVBcCt7mnMLIwC4Fg+ytAJgG9ZAADAjWuPAuBaY9afSQD8GrdgNixXFQC3atuYWbirAPiVpmJFAHyLqwAAgBtjEgDX6jssVxUAv9IymIU7CoBfaSpm1p9JAPwat2A2C4BntW1WAQAAAPiPyGVKAuDZYTYslwD4VdvGzN49C4Bf6Shm1kQBcGydhyEJgGvdJQAA4EZOAuDbMiyrAHi2mNl7ZAHwKx2vmTVXFQC/1mUw6wXAszSVQwCcqwIAAG4cSQBcW4ckAK7lU/8D/a9fSZZlwxkAAAAASUVORK5CYII="); height: 196px; position: absolute; left: 10px; right: 100px; top: 97px; background-size: 100% 100%; background-repeat: no-repeat;}
.release-line li .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.branch-nav .nav li { max-width: 200px; white-space: nowrap; overflow: hidden; }
module/product/model.php
+7 -5
View File
@@ -1587,7 +1587,7 @@ class productModel extends model
}
$total++;
if($count > 0 and $total >= $count) return $this->processRoadmap($roadmap);
if($count > 0 and $total >= $count) return $this->processRoadmap($roadmap, $branch);
}
}
@@ -1610,11 +1610,11 @@ class productModel extends model
}
$total++;
if($count > 0 and $total >= $count) return $this->processRoadmap($roadmap);
if($count > 0 and $total >= $count) return $this->processRoadmap($roadmap, $branch);
}
}
if($count > 0) return $this->processRoadmap($roadmap);
if($count > 0) return $this->processRoadmap($roadmap, $branch);
$groupRoadmap = array();
foreach($roadmap as $year => $branchRoadmaps)
@@ -1655,16 +1655,18 @@ class productModel extends model
* Process roadmap.
*
* @param array $roadmap
* @param int $branch
* @access public
* @return array
*/
public function processRoadmap($roadmapGroups)
public function processRoadmap($roadmapGroups, $branch)
{
$newRoadmap = array();
foreach($roadmapGroups as $year => $branchRoadmaps)
{
foreach($branchRoadmaps as $branch => $roadmaps)
foreach($branchRoadmaps as $branchID => $roadmaps)
{
if($branch != $branchID) continue;
foreach($roadmaps as $roadmap) $newRoadmap[] = $roadmap;
}
}
module/product/view/roadmap.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
<ul class="nav nav-secondary inline-block">
<li class="nav-heading"><?php echo zget($lang->product->branchName, $product->type);?></li>
<?php foreach($branches as $branchKey => $branchName):?>
<li <?php if($branchKey == 0) echo "class='active'";?>><a data-target="#tabContent<?php echo $branchKey;?>" data-toggle="tab"><?php echo $branchName;?></a></li>
<li title="<?php echo $branchName;?>" <?php if($branchKey == 0) echo "class='active'";?>><a data-target="#tabContent<?php echo $branchKey;?>" data-toggle="tab"><?php echo $branchName;?></a></li>
<?php endforeach;?>
</ul>
</div>
module/project/js/create.js
+1
View File
@@ -400,6 +400,7 @@ function removeLine(obj)
{
$(obj).closest('tr').remove();
disableSelectedProduct();
if($("select[name^='products']").length < 2) $('.division').addClass('hide');
}
/**
module/project/js/edit.js
+2
View File
@@ -293,4 +293,6 @@ function addNewLine(obj)
function removeLine(obj)
{
$(obj).closest('tr').remove();
disableSelectedProduct();
if($("select[name^='products']").length < 2) $('.division').addClass('hide');
}
module/project/view/build.html.php
+4 -2
View File
@@ -85,9 +85,11 @@
<?php if($project->multiple):?>
<?php if($build->execution):?>
<td class="c-name text-left" title='<?php echo $build->executionName;?>'>
<?php echo $build->executionName;?>
<?php $executionName = $build->executionName;?>
<?php if($build->executionDeleted) $executionName = "<del>$executionName</del>";?>
<?php echo $executionName;?>
<?php if($build->executionDeleted):?>
<span class='label label-danger'><?php echo $lang->build->deleted;?></span>
<span class='label label-danger' style='position:absolute;right:0px;top:7px;'><?php echo $lang->build->deleted;?></span>
<?php endif; ?>
</td>
<?php else:?>
module/projectrelease/css/view.css
+3 -2
View File
@@ -10,11 +10,12 @@
ol, ul {padding-left: 20px;}
.c-id {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
td.c-build{white-space: nowrap; overflow:hidden;}
th.c-user,td.c-user{text-align:left}
#stories th, #stories td{padding-left:16px;}
#stories th, #stories td{padding-left:16px;padding-right:16px;}
#stories .c-build{width:160px; text-align:left;}
#stories .c-status{width:120px;}
#stories .c-stage{width:130px; text-align:left;}
#stories .c-stage{width:112px; text-align:left;}
#stories .c-estimate{width:90px; text-align:right;}
#bugs .c-build{width:160px; text-align:left;}
#bugs .c-user{width:120px;}
module/projectrelease/view/view.html.php
+10 -10
View File
@@ -102,8 +102,8 @@
<td>
<span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
</td>
<td class='c-build text-left' title='<?php echo $story->buildName?>'><?php echo $story->buildName?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td class='c-build' title='<?php echo $story->buildName?>'><?php echo $story->buildName?></td>
<td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
<td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
<td class='c-stage'><?php echo $lang->story->stageList[$story->stage];?></td>
<td class='c-actions'>
@@ -195,11 +195,11 @@
<span class='status-bug status-<?php echo $bug->status?>'><?php echo $this->processStatus('bug', $bug);?></span>
</td>
<?php $resolvedBuildName = zget($builds, $bug->resolvedBuild, '');?>
<td class='c-build text-left' title='<?php echo $resolvedBuildName?>'><?php echo $resolvedBuildName;?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);?></td>
<td class='c-build' title='<?php echo $resolvedBuildName?>'><?php echo $resolvedBuildName;?></td>
<td class='c-user'><?php echo zget($users, $bug->openedBy);?></td>
<td class='c-date'><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
<td class='c-user'><?php echo zget($users, $bug->resolvedBy);?></td>
<td class='c-date'><?php echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);?></td>
<td class='c-actions'>
<?php
if(common::hasPriv('projectrelease', 'unlinkBug') and $canBeChanged)
@@ -305,9 +305,9 @@
$openedBuildName = '';
foreach(explode(',', $bug->openedBuild) as $buildID) $openedBuildName .= zget($builds, $buildID, '') . ' ';
?>
<td class='c-build text-left' title='<?php echo $openedBuildName?>'><?php echo $openedBuildName;?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo $bug->openedDate?></td>
<td class='c-build' title='<?php echo $openedBuildName?>'><?php echo $openedBuildName;?></td>
<td class='c-user'><?php echo zget($users, $bug->openedBy);?></td>
<td class='c-date'><?php echo $bug->openedDate?></td>
<td class='c-actions'>
<?php
if(common::hasPriv('projectrelease', 'unlinkBug') and $canBeChanged)
module/release/control.php
+1 -1
View File
@@ -314,7 +314,7 @@ class release extends control
$release = $this->dao->select('*')->from(TABLE_RELEASE)->where('id')->eq((int)$releaseID)->fetch();
$build = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq((int)$release->build)->fetch();
$this->loadModel('build')->delete(TABLE_BUILD, $release->shadow);
$this->dao->update(TABLE_BUILD)->set('deleted')->eq(1)->where('id')->eq($release->shadow)->exec();
foreach($builds as $build)
{
if(empty($build->execution) and $build->createdDate == $release->createdDate) $this->build->delete(TABLE_BUILD, $build->id);
module/release/css/browse.css
+1 -1
View File
@@ -3,7 +3,7 @@ td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
#releaseList tbody>tr:hover{background-color: unset!important;}
.main-table tbody>tr>td:first-child{padding: 2px 8px!important;}
#releaseList th, #releaseList td{padding-left:16px !important;}
#releaseList th, #releaseList td{padding-left:16px !important;padding-right:16px !important;}
#releaseList .c-id {width: 60px}
#releaseList .c-branch {width: 100px}
#releaseList .c-date {width: 160px}
module/release/css/view.css
+3 -2
View File
@@ -11,11 +11,12 @@ ol, ul {padding-left: 20px;}
.body-modal #mainContent {min-height: 240px;}
.c-id {width: 110px;}
td.c-build{white-space: nowrap; overflow:hidden;}
th.c-user,td.c-user{text-align:left}
#stories th, #stories td{padding-left:16px;}
#stories th, #stories td{padding-left:16px;padding-right:16px;}
#stories .c-build{width:160px; text-align:left;}
#stories .c-status{width:120px;}
#stories .c-stage{width:130px; text-align:left;}
#stories .c-stage{width:112px; text-align:left;}
#stories .c-estimate{width:90px; text-align:right;}
#bugs .c-build{width:160px; text-align:left;}
#bugs .c-user{width:120px;}
module/release/view/view.html.php
+7 -7
View File
@@ -105,7 +105,7 @@
<span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
</td>
<td class='c-build' title='<?php echo $story->buildName?>'><?php echo $story->buildName?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
<td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
<td class='c-stage'><?php echo $lang->story->stageList[$story->stage];?></td>
<td class='c-actions'>
@@ -198,10 +198,10 @@
</td>
<?php $resolvedBuildName = zget($builds, $bug->resolvedBuild, '');?>
<td class='c-build text-left' title='<?php echo $resolvedBuildName?>'><?php echo $resolvedBuildName;?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);?></td>
<td class='c-user'><?php echo zget($users, $bug->openedBy);?></td>
<td class='c-date'><?php echo substr($bug->openedDate, 5, 11)?></td>
<td class='c-user'><?php echo zget($users, $bug->resolvedBy);?></td>
<td class='c-date'><?php echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);?></td>
<td class='c-actions'>
<?php
if(common::hasPriv('release', 'unlinkBug') and $canBeChanged)
@@ -308,8 +308,8 @@
foreach(explode(',', $bug->openedBuild) as $buildID) $openedBuildName .= zget($builds, $buildID, '') . ' ';
?>
<td class='c-build text-left' title='<?php echo $openedBuildName?>'><?php echo $openedBuildName;?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo $bug->openedDate?></td>
<td class='c-user'><?php echo zget($users, $bug->openedBy);?></td>
<td class='c-date'><?php echo $bug->openedDate?></td>
<td class='c-actions'>
<?php
if(common::hasPriv('release', 'unlinkBug') and $canBeChanged)
module/story/css/change.css
+4 -1
View File
@@ -2,6 +2,9 @@
#affectedProjects .table + h6 {border-top: 1px solid #ddd;}
.nav-tabs>li>a {height: 36px;}
.table-form>tbody>tr>th {width: 100px !important;}
.colorpicker {right: 7px; top: 7px; opacity: 1;}
.colorpicker {right: -1px; top: 7px; opacity: 1;}
#twinsList td, #twinsTitle td {padding-left: 65px;}
#twinsTitle td {font-weight: 700;}
.title-group.required:after {display: none;}
.title-group.required > .required:after {display: block; right: 32px; top: 5px;}
module/story/js/common.js
+8 -1
View File
@@ -96,13 +96,17 @@ function loadURS(allURS)
}
$('.twins').mouseover(function() {
if(page == 'edit') return;
$(this).parent('ul').find('a.unlink').addClass('hide');
$(this).find('.unlink').removeClass('hide');
});
$('.twins').mouseenter(function() {
$('[data-toggle="popover"]').popover('hide');
});
$('.twins').mouseout(function() {
if(page == 'edit') return;
$(this).find('.unlink').addClass('hide');
});
@@ -142,5 +146,8 @@ function relieve(index)
function popoverCancel(index)
{
$('[data-id="' + index + '"]').popover('hide').addClass('hide');
$('[data-id="' + index + '"]').popover('hide');
if(page == 'edit') return;
$('[data-id="' + index + '"]').addClass('hide');
}
module/story/lang/de.php
+5 -3
View File
@@ -476,9 +476,10 @@ $lang->story->recallTip = array();
$lang->story->recallTip['actived'] = 'The Story has not initiated a review process and no undo action is required.';
$lang->story->subDivideTip = array();
$lang->story->subDivideTip['subStory'] = 'The Sub-stories cannot be subdivided.';
$lang->story->subDivideTip['notWait'] = 'The Story has been %s and cannot be subdivided.';
$lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
$lang->story->subDivideTip['subStory'] = 'The Sub-stories cannot be subdivided.';
$lang->story->subDivideTip['notWait'] = 'The Story has been %s and cannot be subdivided.';
$lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
$lang->story->subDivideTip['twinsSplit'] = 'The Twins Story cannot be subdivided.';
$lang->story->featureBar['browse']['all'] = $lang->all;
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
@@ -527,3 +528,4 @@ $lang->story->notice->branch = 'Each branch will establish a requirement. The re
$lang->story->relievedTwinsRelation = 'Relieved twins relationship';
$lang->story->relievedTwinsRelationTips = 'After the twins relationship is terminated, it cannot be restored and the shutdown of the requirement is no longer synchronized.';
$lang->story->changeRelievedTwinsTips = 'After the twins relationship is terminated, the twin stories are no longer synchronized.';
module/story/lang/en.php
+5 -3
View File
@@ -476,9 +476,10 @@ $lang->story->recallTip = array();
$lang->story->recallTip['actived'] = 'The Story has not initiated a review process and no undo action is required.';
$lang->story->subDivideTip = array();
$lang->story->subDivideTip['subStory'] = 'The Sub-stories cannot be subdivided.';
$lang->story->subDivideTip['notWait'] = 'The Story has been %s and cannot be subdivided.';
$lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
$lang->story->subDivideTip['subStory'] = 'The Sub-stories cannot be subdivided.';
$lang->story->subDivideTip['notWait'] = 'The Story has been %s and cannot be subdivided.';
$lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
$lang->story->subDivideTip['twinsSplit'] = 'The Twins Story cannot be subdivided.';
$lang->story->featureBar['browse']['all'] = $lang->all;
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
@@ -527,3 +528,4 @@ $lang->story->notice->branch = 'Each branch will establish a requirement. The re
$lang->story->relievedTwinsRelation = 'Relieved twins relationship';
$lang->story->relievedTwinsRelationTips = 'After the twins relationship is terminated, it cannot be restored and the shutdown of the requirement is no longer synchronized.';
$lang->story->changeRelievedTwinsTips = 'After the twins relationship is terminated, the twin stories are no longer synchronized.';
module/story/lang/fr.php
+5 -3
View File
@@ -476,9 +476,10 @@ $lang->story->recallTip = array();
$lang->story->recallTip['actived'] = "Aucun processus de révision n'a été lancé pour cette Story, et il n'est pas nécessaire de révoquer l'opération.";
$lang->story->subDivideTip = array();
$lang->story->subDivideTip['subStory'] = 'Les sous-stories ne peuvent pas être décomposées.';
$lang->story->subDivideTip['notWait'] = "L'exigence %s ne peut pas être subdivisée.";
$lang->story->subDivideTip['notActive'] = "Cette Story n'est pas active et ne peut être subdivisée.";
$lang->story->subDivideTip['subStory'] = 'Les sous-stories ne peuvent pas être décomposées.';
$lang->story->subDivideTip['notWait'] = "L'exigence %s ne peut pas être subdivisée.";
$lang->story->subDivideTip['notActive'] = "Cette Story n'est pas active et ne peut être subdivisée.";
$lang->story->subDivideTip['twinsSplit'] = 'The Twins Story cannot be subdivided.';
$lang->story->featureBar['browse']['all'] = $lang->all;
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
@@ -527,3 +528,4 @@ $lang->story->notice->branch = 'Each branch will establish a requirement. The re
$lang->story->relievedTwinsRelation = 'Relieved twins relationship';
$lang->story->relievedTwinsRelationTips = 'After the twins relationship is terminated, it cannot be restored and the shutdown of the requirement is no longer synchronized.';
$lang->story->changeRelievedTwinsTips = 'After the twins relationship is terminated, the twin stories are no longer synchronized.';
module/story/lang/zh-cn.php
+5 -3
View File
@@ -476,9 +476,10 @@ $lang->story->recallTip = array();
$lang->story->recallTip['actived'] = '该需求未发起评审流程，无需撤销操作';
$lang->story->subDivideTip = array();
$lang->story->subDivideTip['subStory'] = '子需求无法细分';
$lang->story->subDivideTip['notWait'] = '该需求%s，无法进行细分操作';
$lang->story->subDivideTip['notActive'] = '需求不是激活状态，无法进行细分操作';
$lang->story->subDivideTip['subStory'] = '子需求无法细分';
$lang->story->subDivideTip['notWait'] = '该需求%s，无法进行细分操作';
$lang->story->subDivideTip['notActive'] = '需求不是激活状态，无法进行细分操作';
$lang->story->subDivideTip['twinsSplit'] = '孪生需求不可细分';
$lang->story->featureBar['browse']['all'] = '全部';
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
@@ -527,3 +528,4 @@ $lang->story->notice->branch = '每个分支会建立一个需求，需求间互
$lang->story->relievedTwinsRelation = '解除孪生关系';
$lang->story->relievedTwinsRelationTips = '孪生关系解除后无法恢复，需求的关闭将不再同步。';
$lang->story->changeRelievedTwinsTips = '孪生关系解除后无法恢复，孪生需求间内容不再同步。';
module/story/model.php
+36 -12
View File
@@ -778,7 +778,7 @@ class storyModel extends model
->get();
$story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->change['id'], $this->post->uid);
$this->dao->update(TABLE_STORY)->data($story, 'spec,verify,deleteFiles')
$this->dao->update(TABLE_STORY)->data($story, 'spec,verify,deleteFiles,relievedTwins')
->autoCheck()
->batchCheck($this->config->story->change->requiredFields, 'notempty')
->checkFlow()
@@ -804,7 +804,7 @@ class storyModel extends model
$this->dao->insert(TABLE_STORYSPEC)->data($data)->exec();
/* Sync twins. */
if(!empty($oldStory->twins))
if(!isset($story->relievedTwins) and !empty($oldStory->twins))
{
foreach(explode(',', trim($oldStory->twins, ',')) as $twinID)
{
@@ -843,7 +843,7 @@ class storyModel extends model
$this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
/* Sync twins. */
if(!empty($oldStory->twins))
if(!isset($story->relievedTwins) and !empty($oldStory->twins))
{
foreach(explode(',', trim($oldStory->twins, ',')) as $twinID)
{
@@ -861,7 +861,17 @@ class storyModel extends model
}
$changes = common::createChanges($oldStory, $story);
if(!empty($oldStory->twins)) $this->syncTwins($oldStory->id, $oldStory->twins, $changes, 'Changed');
if(isset($story->relievedTwins))
{
$this->dbh->exec("UPDATE " . TABLE_STORY . " SET twins = REPLACE(twins, ',$storyID,', ',') WHERE `product` = $oldStory->product");
$this->dao->update(TABLE_STORY)->set('twins')->eq('')->where('id')->eq($storyID)->orWhere('twins')->eq(',')->exec();
}
elseif(!empty($oldStory->twins))
{
$this->syncTwins($oldStory->id, $oldStory->twins, $changes, 'Changed');
}
return $changes;
}
}
@@ -1956,10 +1966,6 @@ class storyModel extends model
}
if(dao::isError()) return print(js::error(dao::getError()));
$isonlybody = isonlybody();
unset($_GET['onlybody']);
return print(js::locate(helper::createLink('product', 'browse', "productID=$oldStory->product&branch=0&browseType=unclosed&queryID=0&type=story"), $isonlybody ? 'parent.parent' : 'parent'));
}
else
{
@@ -2189,12 +2195,17 @@ class storyModel extends model
$oldStoryStages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($storyIdList)->fetchGroup('story', 'branch');
$unlinkPlans = array();
$link2Plans = array();
if(empty($plan))
{
$plan = new stdClass();
$plan->branch = BRANCH_MAIN;
}
/* Cycle every story and process it's plan and stage. */
foreach($storyIdList as $storyID)
{
$oldStory = $oldStories[$storyID];
if($oldStory->branch != BRANCH_MAIN and $oldStory->branch != $plan->branch and $plan->branch != BRANCH_MAIN) continue;
if($oldStory->branch != BRANCH_MAIN and !in_array($oldStory->branch, explode(',', $plan->branch)) and $plan->branch != BRANCH_MAIN) continue;
/* Ignore parent story, closed story and story linked to this plan already. */
if($oldStory->parent < 0) continue;
@@ -2224,6 +2235,14 @@ class storyModel extends model
->where('product')->eq($oldStory->product)
->andWhere('id')->in($oldStory->plan)
->fetchPairs();
foreach($branchPlanPairs as $branches => $planParis)
{
foreach(explode(',', $branches) as $branch)
{
$branchPlanPairs[$branch] = $planParis;
}
unset($branchPlanPairs[$branches]);
}
if($planID == 0 and !empty($oldStory->plan) and isset($branchPlanPairs[0]) and $branchPlanPairs[0] != $planID) $unlinkPlans[$branchPlanPairs[0]] = empty($unlinkPlans[$branchPlanPairs[0]]) ? $storyID : "{$unlinkPlans[$branchPlanPairs[0]]},$storyID";
if($planID != 0)
{
@@ -2238,7 +2257,7 @@ class storyModel extends model
}
}
foreach(explode(',', $plan->branch) as $planBranch) if(isset($branchPlanPairs[$planBranch])) $branchPlanPairs[$planBranch] = $planID;
$story->plan = $oldStory->plan ? implode(',', $branchPlanPairs) : $planID;
$story->plan = $oldStory->plan ? implode(',', array_unique($branchPlanPairs)) : $planID;
$story->plan = trim($story->plan, ',');
if($story->plan != $oldStory->plan and !empty($planID)) $link2Plans[$planID] = empty($link2Plans[$planID]) ? $storyID : "{$link2Plans[$planID]},$storyID";
}
@@ -3786,7 +3805,7 @@ class storyModel extends model
->andWhere('parent')->le(0)
->andWhere('type')->eq('story')
->andWhere('stage')->eq('wait')
->andWhere('status')->notin('closed,draft')
->andWhere('status')->eq('active')
->andWhere('product')->eq($productID)
->andWhere('plan')->in('0,')
->andWhere('twins')->eq('')
@@ -4529,6 +4548,7 @@ class storyModel extends model
if($action == 'activate') return $story->status == 'closed';
if($action == 'assignto') return $story->status != 'closed';
if($action == 'batchcreate' and $story->parent > 0) return false;
if($action == 'batchcreate' and !empty($story->twins)) return false;
if($action == 'batchcreate' and $story->type == 'requirement' and $story->status != 'closed') return strpos('draft,reviewing,changing', $story->status) === false;
if($action == 'batchcreate' and $config->vision == 'lite' and ($story->status == 'active' and ($story->stage == 'wait' or $story->stage == 'projected'))) return true;
/* Adjust code, hide split entry. */
@@ -4633,6 +4653,10 @@ class storyModel extends model
{
$title = $this->lang->story->subDivideTip['subStory'];
}
elseif(!empty($story->twins))
{
$title = $this->lang->story->subDivideTip['twinsSplit'];
}
else
{
if($story->status != 'active') $title = $this->lang->story->subDivideTip['notActive'];
@@ -4803,7 +4827,7 @@ class storyModel extends model
$executionID = empty($execution) ? 0 : $execution->id;
/* Adjust code, hide split entry. */
if(common::hasPriv('story', 'batchCreate') and !$execution->multiple and !$execution->hasProduct and false)
if(common::hasPriv('story', 'batchCreate') and !$execution->multiple and !$execution->hasProduct)
{
$isClick = $this->isClickable($story, 'batchcreate');
$title = $this->lang->story->subdivide;
module/story/view/blocktwins.html.php
+2 -1
View File
@@ -17,12 +17,13 @@ foreach($twins as $twin)
$branch = isset($branches[$twin->branch]) ? $branches[$twin->branch] : '';
$stage = $lang->story->stageList[$twin->stage];
$labelClass = $story->branch == $twin->branch ? 'label-primary' : '';
$hide = $this->app->rawMethod == 'edit' ? '' : 'hide';
echo "<li title='$title' class='twins'>";
echo "<span class='label {$labelClass} label-outline label-badge' title='$branch'>{$branch}</span> ";
echo "<span class='label label-outline' title='{$stage}'>{$stage}</span> ";
echo ($canViewLinkStory ? html::a($this->createLink('story', 'view', "id=$id", '', true), "$title", '', "class='$class viewlink' data-width='80%'") : "$title");
if($canRelieved) echo "<a class='unlink hide' data-id='$id' data-toggle='popover'><i class='icon icon-unlink btn-info'></i></a>";
if($canRelieved) echo "<a class='unlink $hide' data-id='$id' data-toggle='popover'><i class='icon icon-unlink btn-info'></i></a>";
echo "</li>";
}
?>
module/story/view/change.html.php
+17 -7
View File
@@ -44,14 +44,24 @@
<tr>
<th><?php echo $lang->story->title;?></th>
<td>
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->story->colorTag; ?><i class="icon icon-close"></i></li>
</ul>
<input type="hidden" class="colorpicker" id="color" name="color" value="<?php echo $story->color ?>" data-icon="color" data-wrapper="input-control-icon-right" data-update-color=".story-title" data-provide="colorpicker">
<?php $titleGroup = empty($story->twins) ? '' : 'title-group';?>
<div class='input-group <?php echo $titleGroup?>'>
<div class="input-control has-icon-right">
<?php echo html::input('title', $story->title, 'class="form-control story-title"');?>
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->story->colorTag; ?><i class="icon icon-close"></i></li>
</ul>
<input type="hidden" class="colorpicker" id="color" name="color" value="<?php echo $story->color ?>" data-icon="color" data-wrapper="input-control-icon-right" data-update-color=".story-title" data-provide="colorpicker">
</div>
</div>
<?php if(!empty($story->twins)):?>
<div class="input-group-addon">
<?php echo html::checkbox('relievedTwins', $lang->story->relievedTwinsRelation, '', "id='relievedTwins' title='{$lang->story->changeRelievedTwinsTips}'");?>
</div>
<?php endif;?>
</div>
<?php echo html::input('title', $story->title, 'class="form-control story-title"');?>
</td>
</tr>
<tr>
module/story/view/view.html.php
+1
View File
@@ -15,6 +15,7 @@
<?php $browseLink = $app->session->storyList ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product");?>
<?php js::set('sysurl', common::getSysUrl());?>
<?php js::set('storyType', $story->type);?>
<?php js::set('page', $this->app->rawMethod);?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
module/task/lang/fr.php
+4
View File
@@ -215,6 +215,10 @@ $lang->task->reasonList['cancel'] = 'Annulé';
$lang->task->modeList['linear'] = 'Multiple Person Serial';
$lang->task->modeList['multi'] = 'Multiple Person Parallel';
$lang->task->editModeList['single'] = 'Single';
$lang->task->editModeList['linear'] = 'Serial';
$lang->task->editModeList['multi'] = 'Parallel';
$lang->task->afterChoices['continueAdding'] = ' Continuer Ajouter Tâches';
$lang->task->afterChoices['toTaskList'] = 'Aller à la liste des Tâches';
$lang->task->afterChoices['toStoryList'] = 'Aller à la liste des Stories';
module/task/view/edit.html.php
+19 -1
View File
@@ -132,7 +132,25 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
<?php endif;?>
<tr class="modeBox">
<th><?php echo $lang->task->mode;?></th>
<td><?php echo $task->status == 'wait' ? html::select('mode', $lang->task->editModeList, $task->mode, "class='form-control chosen'") : zget($lang->task->editModeList, $task->mode);?></td>
<td>
<?php
if($task->status == 'wait')
{
echo html::select('mode', $lang->task->editModeList, $task->mode, "class='form-control chosen'");
}
else
{
if($task->mode == '')
{
echo $lang->task->editModeList['single'];
}
else
{
echo zget($lang->task->editModeList, $task->mode);
}
}
?>
</td>
</tr>
<tr>
<th><?php echo $lang->task->assignedTo;?></th>
module/task/view/view.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
<div class="page-title">
<span class="label label-id"><?php echo $task->id?></span>
<span class="text" title='<?php echo $task->name;?>' style='color: <?php echo $task->color; ?>'>
<?php if(!empty($task->team)) echo '<span class="label label-badge label-primary no-margin">' . $lang->task->multipleAB . (common::checkNotCN() ? ' ' : '') . $lang->task->modeList[$task->mode] . '</span>';?>
<?php if(!empty($task->team)) echo '<span class="label label-badge label-primary no-margin">' . (common::checkNotCN() ? ' ' : '') . $lang->task->modeList[$task->mode] . '</span>';?>
<?php if($task->parent > 0) echo '<span class="label label-badge label-primary no-margin">' . $lang->task->childrenAB . '</span>';?>
<?php if($task->parent > 0) echo isset($task->parentName) ? html::a(inlink('view', "taskID={$task->parent}"), $task->parentName) . ' / ' : '';?><?php echo $task->name;?>
</span>
module/upgrade/config.php
+2
View File
@@ -29,6 +29,7 @@ $config->upgrade->maxVersion['max3_6_3'] = '17_6_2';
$config->upgrade->maxVersion['max3_7'] = '17_7';
$config->upgrade->maxVersion['max3_8'] = '17_8';
$config->upgrade->maxVersion['max4_0_beta1'] = '18_0_beta1';
$config->upgrade->maxVersion['max4_0_beta2'] = '18_0_beta2';
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -96,6 +97,7 @@ $config->upgrade->bizVersion['biz7_6_2'] = '17_6_2';
$config->upgrade->bizVersion['biz7_7'] = '17_7';
$config->upgrade->bizVersion['biz7_8'] = '17_8';
$config->upgrade->bizVersion['biz8_0_beta1'] = '18_0_beta1';
$config->upgrade->bizVersion['biz8_0_beta2'] = '18_0_beta2';
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
module/upgrade/lang/version.php
+3
View File
@@ -170,6 +170,7 @@ $lang->upgrade->fromVersions['17_6_2'] = '17.6.2';
$lang->upgrade->fromVersions['17_7'] = '17.7';
$lang->upgrade->fromVersions['17_8'] = '17.8';
$lang->upgrade->fromVersions['18_0_beta1'] = '18.0.beta1';
$lang->upgrade->fromVersions['18_0_beta2'] = '18.0.beta2';
global $config;
/* Lite. */
@@ -344,6 +345,7 @@ $lang->upgrade->fromVersions['biz7_6_2'] = 'Biz7.6.2';
$lang->upgrade->fromVersions['biz7_7'] = 'Biz7.7';
$lang->upgrade->fromVersions['biz7_8'] = 'Biz7.8';
$lang->upgrade->fromVersions['biz8_0_beta1'] = 'Biz8.0.beta1';
$lang->upgrade->fromVersions['biz8_0_beta2'] = 'Biz8.0.beta2';
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -374,3 +376,4 @@ $lang->upgrade->fromVersions['max3_6_2'] = 'Max3.6.2';
$lang->upgrade->fromVersions['max3_6_3'] = 'Max3.6.3';
$lang->upgrade->fromVersions['max3_7'] = 'Max3.7';
$lang->upgrade->fromVersions['max3_8'] = 'Max3.8';
$lang->upgrade->fromVersions['max4_0_beta1'] = 'Max4.0.beta1';
module/upgrade/model.php
+11
View File
@@ -577,6 +577,13 @@ class upgradeModel extends model
$this->xuanNotifyGroupHiddenUsers();
$this->initShadowBuilds();
break;
case '18_0_beta1':
if(!$executedXuanxuan)
{
$xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan6.6.sql';
$this->execSQL($xuanxuanSql);
}
break;
}
$this->deletePatch();
@@ -1059,6 +1066,10 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('17.8'));
$xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan6.5.sql';
$confirmContent .= file_get_contents($xuanxuanSql);
case '18_0_beta1':
$confirmContent .= file_get_contents($this->getUpgradeFile('18.0.beta1'));
$xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan6.6.sql';
$confirmContent .= file_get_contents($xuanxuanSql);
}
return $confirmContent;
module/user/control.php
+3 -3
View File
@@ -1048,10 +1048,10 @@ class user extends control
public function logout($referer = 0)
{
if(isset($this->app->user->id)) $this->loadModel('action')->create('user', $this->app->user->id, 'logout');
setcookie('za', false, time() - 3600, $this->config->webRoot);
setcookie('zp', false, time() - 3600, $this->config->webRoot);
setcookie('tab', false, time() - 3600, $this->config->webRoot); ;
session_destroy();
setcookie('za', false);
setcookie('zp', false);
setcookie('tab', false);
if($this->app->getViewType() == 'json') return print(json_encode(array('status' => 'success')));
$vars = !empty($referer) ? "referer=$referer" : '';
module/user/model.php
+2
View File
@@ -663,6 +663,8 @@ class userModel extends model
$this->mail->syncSendCloud('sync', $user->email, $user->realname);
}
}
if($_POST['account'] == $this->app->user->account and $user->role != $_SESSION['user']->role) $_SESSION['user']->role = $user->role;
}
/**
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/fonts/ZentaoIcon.eot
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.svg
+281 -278
View File
File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 KiB

After

Width:  |  Height:  |  Size: 262 KiB

www/theme/zui/fonts/ZentaoIcon.ttf
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.woff
BIN
View File
Binary file not shown.
xuanxuan/XUANVERSION
+1 -1
View File
@@ -1 +1 @@
a975bd7e7e1fd29bc95ee7b9c5bafdc94a4e9eb0
6d5d77c11978c707cb8204353f640a3ecca6e046
xuanxuan/XVERSION
+1 -1
View File
@@ -1 +1 @@
6.6
7.0