diff --git a/config/zentaopms.php b/config/zentaopms.php
index d1d7953112..823209c6f1 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -395,6 +395,10 @@ define('TABLE_DESIGN', '`' . $config->db->prefix . 'design`');
define('TABLE_DESIGNSPEC', '`' . $config->db->prefix . 'designspec`');
define('TABLE_DOCLIB', '`' . $config->db->prefix . 'doclib`');
define('TABLE_DOC', '`' . $config->db->prefix . 'doc`');
+define('TABLE_DEMANDPOOL', '`' . $config->db->prefix . 'demandpool`');
+define('TABLE_DEMAND', '`' . $config->db->prefix . 'demand`');
+define('TABLE_DEMANDSPEC', '`' . $config->db->prefix . 'demandspec`');
+define('TABLE_DEMANDREVIEW', '`' . $config->db->prefix . 'demandreview`');
define('TABLE_API', '`' . $config->db->prefix . 'api`');
define('TABLE_API_SPEC', '`' . $config->db->prefix . 'apispec`');
define('TABLE_APISTRUCT', '`' . $config->db->prefix . 'apistruct`');
@@ -591,6 +595,13 @@ define('TABLE_AI_MODEL', '`' . $config->db->prefix . 'ai_model`');
define('TABLE_SQLITE_QUEUE', '`' . $config->db->prefix . 'sqlite_queue`');
+if(!defined('TABLE_ROADMAP')) define('TABLE_ROADMAP', '`' . $config->db->prefix . 'roadmap`');
+if(!defined('TABLE_ROADMAPSTORY')) define('TABLE_ROADMAPSTORY', '`' . $config->db->prefix . 'roadmapstory`');
+if(!defined('TABLE_CHARTER')) define('TABLE_CHARTER', '`' . $config->db->prefix . 'charter`');
+if(!defined('TABLE_MARKET')) define('TABLE_MARKET', '`' . $config->db->prefix . 'market`');
+if(!defined('TABLE_MARKETREPORT')) define('TABLE_MARKETREPORT', '`' . $config->db->prefix . 'marketreport`');
+if(!defined('TABLE_MARKETRESEARCH')) define('TABLE_MARKETRESEARCH', '`' . $config->db->prefix . 'project`');
+
$config->objectTables['dept'] = TABLE_DEPT;
$config->objectTables['product'] = TABLE_PRODUCT;
$config->objectTables['productplan'] = TABLE_PRODUCTPLAN;
@@ -614,6 +625,10 @@ $config->objectTables['user'] = TABLE_USER;
$config->objectTables['api'] = TABLE_API;
$config->objectTables['doc'] = TABLE_DOC;
$config->objectTables['doclib'] = TABLE_DOCLIB;
+$config->objectTables['demand'] = TABLE_DEMAND;
+$config->objectTables['demandpool'] = TABLE_DEMANDPOOL;
+$config->objectTables['demandspec'] = TABLE_DEMANDSPEC;
+$config->objectTables['demandreview'] = TABLE_DEMANDREVIEW;
$config->objectTables['todo'] = TABLE_TODO;
$config->objectTables['custom'] = TABLE_LANG;
$config->objectTables['branch'] = TABLE_BRANCH;
@@ -671,6 +686,12 @@ $config->objectTables['design'] = TABLE_DESIGN;
$config->objectTables['prompt'] = TABLE_AI_PROMPT;
$config->objectTables['aiapp'] = TABLE_AI_MINIPROGRAM;
$config->objectTables['miniprogram'] = TABLE_AI_MINIPROGRAM;
+$config->objectTables['roadmap'] = TABLE_ROADMAP;
+$config->objectTables['charter'] = TABLE_CHARTER;
+$config->objectTables['market'] = TABLE_MARKET;
+$config->objectTables['marketreport'] = TABLE_MARKETREPORT;
+$config->objectTables['marketresearch'] = TABLE_PROJECT;
+$config->objectTables['researchstage'] = TABLE_PROJECT;
$config->newFeatures = array('introduction', 'tutorial', 'youngBlueTheme', 'visions', 'aiPrompts', 'promptDesign', 'promptExec');
$config->disabledFeatures = '';
diff --git a/db/update20.0.beta2.sql b/db/update20.0.beta2.sql
index 36d961d7ae..5c731d6f40 100644
--- a/db/update20.0.beta2.sql
+++ b/db/update20.0.beta2.sql
@@ -17,3 +17,7 @@ ALTER TABLE zt_metriclib MODIFY id bigint AUTO_INCREMENT;
UPDATE `zt_chart` SET `sql` = 'select tt.topProgram,tt.programID as id,tt.`year`,sum(tt.product) as product,sum(tt.plan) as plan,sum(tt.`release`) as `release`,sum(tt.story) as story,sum(tt.bug) as bug,sum(tt.doc) as doc\r\nfrom (\r\nselect t2.name as topProgram,t2.id as programID,t0.`year`,count(1) as product,0 as plan,0 as story,0 as bug,0 as `release`, 0 as doc\r\nfrom zt_product t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.createdDate) = t0.`year`\r\nleft join zt_project t2 on t1.program = t2.id\r\nwhere t1.deleted = \'0\' and t1.shadow = \'0\'\r\nand t2.type = \'program\' and t2.grade = 1 and t2.deleted = \'0\'\r\ngroup by t2.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,count(1) as plan,0 as story,0 as bug,0 as `release`, 0 as doc\r\nfrom zt_productplan t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.createdDate) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,0 as story,0 as bug,0 as `release`, count(1) as doc\r\nfrom zt_doc t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.addedDate) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,0 as story,0 as bug,0 as `release`, count(distinct t1.id) as doc\r\nfrom zt_doc t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.addedDate) = t0.`year`\r\nleft join zt_projectproduct t4 on t1.project = t4.project\r\nleft join zt_product t2 on t2.id = t4.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,0 as story,0 as bug,count(1) as `release`, 0 as doc\r\nfrom zt_release t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.date) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,count(1) as story,0 as bug,0 as `release`, 0 as doc\r\nfrom zt_story t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.openedDate) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\nunion all\r\nselect t3.name as topProgram,t3.id as programID,t0.`year`,0 as product,0 as plan,0 as story,count(1) as bug,0 as `release`, 0 as doc\r\nfrom zt_bug t1\r\nleft join (SELECT DISTINCT YEAR(`date`) as \'year\' FROM zt_action) t0 on YEAR(t1.openedDate) = t0.`year`\r\nleft join zt_product t2 on t2.id = t1.product\r\nleft join zt_project t3 on t2.program = t3.id\r\nwhere t1.deleted = \'0\'\r\nand t2.deleted = \'0\'\r\nand t3.type = \'program\' and t3.grade = 1 and t3.deleted = \'0\'\r\ngroup by t3.id, t0.`year`\r\n) tt\r\ngroup by tt.programID, tt.`year`' WHERE `name` = '年度新增-项目集年度新增数据汇总表';
UPDATE `zt_chart` SET `sql` = 'SELECT YEAR(t1.date) AS `year`,IFNULL(t2.realname,t1.actor) AS realname,count(1) AS count FROM zt_action t1 LEFT JOIN zt_user AS t2 ON t1.actor=t2.account where t1.actor is not null and t1.actor not in(\'\', \'system\') GROUP BY `year`,t1.actor ORDER BY `year`, `count` DESC' WHERE `name` = '年度排行-个人-禅道操作次数榜';
UPDATE `zt_chart` SET `sql` = 'SELECT t1.id, t1.NAME AS project, IFNULL( t2.NAME, \'/\') AS program, IFNULL( t3.story, 0 ) AS story, IFNULL( t3.estimate, 0 ) AS estimate, IFNULL( t4.execution, 0 ) AS execution, IFNULL( t5.workhour, 0 ) AS workhour FROM zt_project AS t1 LEFT JOIN zt_project AS t2 ON FIND_IN_SET( t2.id, t1.path ) AND t2.deleted = \'0\' AND t2.type = \'program\' AND t2.grade = 1 LEFT JOIN( SELECT t1.parent AS project, COUNT( 1 ) AS story, ROUND( SUM( t1.estimate ), 1 ) AS estimate FROM ( SELECT DISTINCT t1.parent, t3.id, t3.estimate FROM zt_project AS t1 LEFT JOIN zt_projectstory AS t2 ON t1.id = t2.project LEFT JOIN zt_story AS t3 ON t2.story = t3.id AND t3.deleted = \'0\' AND t3.stage NOT IN ( \'verified\', \'released\', \'closed\' ) WHERE t1.deleted = \'0\' AND t1.type IN ( \'sprint\', \'stage\', \'kanban\' ) AND t3.id IS NOT NULL ) AS t1 GROUP BY project ) AS t3 ON t1.id = t3.project LEFT JOIN ( SELECT parent AS project, COUNT( 1 ) AS execution FROM zt_project WHERE deleted = \'0\' AND type IN ( \'sprint\', \'stage\', \'kanban\' ) AND multiple = \'1\' AND STATUS NOT IN ( \'done\', \'closed\' ) GROUP BY project ) AS t4 ON t1.id = t4.project LEFT JOIN ( SELECT t1.parent AS project, ROUND( SUM( t2.LEFT ), 1 ) AS workhour FROM zt_project AS t1 LEFT JOIN zt_task AS t2 ON t1.id = t2.execution AND t2.deleted = \'0\' AND t2.parent < 1 WHERE t1.deleted = \'0\' AND t1.type IN ( \'sprint\', \'stage\', \'kanban\' ) AND t1.STATUS NOT IN ( \'done\', \'closed\' ) AND t2.id IS NOT NULL GROUP BY project ) AS t5 ON t1.id = t5.project WHERE t1.deleted = \'0\' AND t1.type = \'project\' AND t1.STATUS = \'doing\'' WHERE `name` = '年度进行中项目-项目剩余工作量透视表';
+
+UPDATE `zt_grouppriv` SET `method` = 'recordWorkhour' WHERE `module` = 'task' AND `method` = 'recordEstimate';
+UPDATE `zt_grouppriv` SET `method` = 'editEffort' WHERE `module` = 'task' AND `method` = 'editEstimate';
+UPDATE `zt_grouppriv` SET `method` = 'deleteWorkhour' WHERE `module` = 'task' AND `method` = 'deleteEstimate';
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 9a7481802f..8d0b250ec1 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,125 +1,307 @@
-2024-04-15 20.0
+2024-04-23 20.0
完成的需求
修复的Bug
开源版：
-45780 【20版本】项目集年度新增数据汇总表文档数没有统计项目和执行下的数据
-46259 【20版本】关联代码库页面字段展示空白
-46209 【20版本】测试用例页面报错
-46099 【20版本】新手教程项目概况页面有报错
-46090 【20版本】后台设置关闭软需备注为必填项关闭需求时设置不生效
-46013 【20版本】个人面板下拉被遮挡
-45936 【20版本】执行看板中转入任务弹窗中部分内容未添加英文语言项
-45916 【20版本】测试单下批量执行用例建议增加提示信息
-45552 【20版本】待处理-用例下执行用例，执行结果为失败，关闭弹窗没有刷新页面
-45541 【20版本】创建泳道时泳道颜色按钮样式异常
-45351 【20版本】产品计划删除计划提示弹窗样式未更新为最新
-45210 【20版本】设置看板泳道颜色的显示样式有误
-45168 【20版本】创建好执行后的提示语不对
-45163 【20版本】树状图和20版本需求样式不同
-45154 【20版本】删除阶段弹窗样式与20版本规范不一致
-45098 【20版本】创建融合瀑布项目，复制项目后，提示语不展示
-45083 【20版本】用例列表区块没有数据时，中间多了一条横线
-45062 【20版本】后台二开编辑器页面列表标题和缩进样式有误
-45032 【20版本】测试下提bug表单中维护模块时，点击产品跳转链接不正确
-44993 【20版本】接口空间的版本管理样式需要优化
-44899 【20版本】看板项目在设置-产品新关联产品没有历史记录
-44885 【20版本】瀑布和融合瀑布项目于产品解除关联的逻辑未修改
-44871 【20版本】敏捷项目-产品型-有迭代不能关联其他产品
-44870 【20版本】执行总览中执行总量的数据和列表对不上
-44743 【20版本】项目集白名单选择权限组后，项目集白名单内无白名单人员展示
-44694 【20版本】地盘动态的背景太暗了
-44691 【20版本】审批按钮语义不清晰
-44689 【20版本】创建执行固定团队名称字段后，勾选复制团队后未显示复制团队字段
-44681 【20版本】编辑泳道的泳道颜色样式需优化
-44635 【20版本】创建泳道的泳道颜色样式需优化
-44626 【20版本】项目的历史记录，汉化不完整
-44605 【20版本】项目列表选“全部”，选一个项目点删除，删完跳到了“进行中”
-44591 【20版本】项目列表保存搜索条件，无效
-44550 【20版本】融合瀑布-项目型编辑页面不应该展示阶段类型
-44524 【20版本】地盘仪表盘使用帮助区块中，鼠标悬浮的样式奇怪
-44519 【20版本】地盘仪表盘欢迎总览区块指派给我的任务数和待处理模块不一致
-43519 【20版本】专业研发看板下设置背景色弹窗中样式不对
-42994 【20版本】批量删除用例库用例没有二次提醒
-42583 【20版本】用例导图模式下点返回后到了列表视图下
-42460 【20版本】地盘仪表盘区块的问号提示闪动
-42405 【20版本】修改日志内容后弹窗没有更新
-42306 【20版本】执行研发需求导出弹窗页导出字段中显示了平台/分支
-42274 【20版本】点击已保存的查询条件后没有自动显示
-42233 【20版本】阶段列表各tab标签下子阶段的显示优化
+31080 公司级需求完成率和Bug修复率鼠标悬停时，显示了status
+31283 年度排行榜大屏中禅道操作次数帮有个人名称没有显示出来
+31554 项目剩余工作量透视表中无迭代项目的剩余执行数显示成了“1”
+32497 查看BI大屏公司数据盘点产品数量对不上
+34645 内置接口文档页面其他下显示dimension和pivot
+34772 产品名称较长时图表展示时右移了
+34807 图表的滚动条无法拖动
41081 【20版本】设置泳道背景色弹窗页，需再次点击才可设置颜色
-47667 【20版本】下载发布基本信息页面的附件提示没有权限访问
-46905 【20版本】操作文档库目录后，目录应不折叠
-46027 【20版本】员工负载表字段显示不完整
-45048 【20版本】用例列表自动化测试用例标签颜色
-44592 【20版本】产品列表选择某一项目集后，切换回所有项目集的交互异常
-43625 【20版本】新手教程部分页面未校验必填
-43214 【20版本】项目发布下修改附件名称保存后跳转到了发布的需求列表
-42486 【20版本】项目仪表盘[今年完成]迭代统计数量不正确
-47709 【20版本】全局搜索结果页输入ID全局搜索时搜索项重复展示
-47706 【20版本】任务记录工时保存后新增日志不能到已提交区块中
-47680 【20版本】全局搜索关键字搜索结果页面显示了二级导航
-47679 【20版本】全局搜索结果页面分页无效
-47673 【20版本】项目型项目的发布通知弹窗中选项换行显示
-47666 【20版本】发布下查看需求详情右侧会有重叠显示
-47594 【20版本】执行-bug页面报错
-47567 【20版本】已解决的bug批量解决后提示保存成功
-46466 【20版本】仅自动化下创建用例没有自动都选上自动化按钮
-46464 【20版本】关联用例默认记住了上次的查询条件，导致无法获取到可关联的用例
-46462 【20版本】套件关联用例，底部按钮被遮挡
-44667 【20版本】创建项目页，权限交互操作范围过大
-44597 【20版本】项目列表的搜索，这个按钮点了会闪
-43269 【20版本】上传php附件时未出现风险提示
-47675 【20版本】项目列表中勾选项目后点批量编辑按钮提示保存成功
-47672 【20版本】融合瀑布项目仪表盘有报错
-47663 【20版本】创建产品页面字段显示设置弹窗点击保存按钮没有反应
-47558 【20版本】接口库中创建数据结构报错
-44939 【20版本】批量编辑项目页面，计划结束不能选择长期
-43438 【20版本】用例或者场景无法拖动
-47640 【20版本】视野没BI权限，无法查看欢迎总览区块
-47457 【20版本】项目视图下选中某个项目集后创建项目页面所属项目集为自动带出
-47002 【20版本】执行下任务列表转入Bug时Bug详情页点击编辑或复制按钮后二级导航不对
-46977 【20版本】有产品无迭代项目用户需求列表页显示了按照计划关联按钮
-46497 【20版本】子场景下有用例，父场景下还提示暂无用例
-45157 【20版本】任务详情页中研发需求有变更时左侧缺少确认按钮
-45151 【20版本】编辑融合瀑布项目的自建测试阶段切换阶段类型为需求后，编辑前创建的阶段下Bug显示所属执行已删除
-45132 【20版本】创建执行页，同一个产品可以重复选择，且提示语不对
-45109 【20版本】创建执行选择运维迭代时未添加提示语
-45104 【20版本】复制执行的样式和需求不一致
-45079 【20版本】瀑布项目统计区块中进度偏差率和成本偏差率的背景颜色太暗
-45003 【20版本】项目集产品视角列表编辑产品选项缺失
-44992 【20版本】执行关联产品页面热区太小
-44950 【20版本】在小屏批量创建任务时，表单底部横向滚动条被遮挡
-44944 【20版本】当项目名称字段过长时，项目列表的延期标签不显示
-44930 【20版本】测试单阻塞的弹窗中备注字段没有居左对齐
-44923 【20版本】给项目型项目创建发布时，发布名称右侧缺少里程碑的勾选
-44915 【20版本】项目发布的通知弹窗字段没有居左对齐
-44906 【20版本】项目导出数据选择导出字段下拉框超出弹窗
-44895 【20版本】发布详情中切换的文字样式不对
-44809 【20版本】禅道客户端未兼容20版本
-44581 【20版本】勾选待定后，预算单位也只读了
-44566 【20版本】文档版本的位置不对
-44530 【20版本】执行维护团队列表没有对齐
-44528 【20版本】融合敏捷-项目型创建迭代页面“关联计划”没有对齐
-43504 【20版本】可关联的需求列表显示不友好
-43334 【20版本】接口空间接口详情页左侧标签和二级导航重叠
-43256 【20版本】项目列表按预算排序不正确
-43075 【20版本】项目关闭和激活的窗口显示过长
-42305 【20版本】创建任务默认类型为设计，建议更新为开发
+42233 【20版本】阶段列表各tab标签下子阶段的显示优化
42252 【20版本】统一列表字段加粗显示
-47449 【20版本】执行下创建用例保存后出现空白页面
-47448 【20版本】用例详情页“相关研发需求”文案部分遮挡
-47446 【20版本】待处理用例页面有代码报错
-47429 【20版本】项目列表看板视图更多按钮下样式不对
-47369 【20版本】项目和执行版本列表编辑按钮右侧显示了多余的“编辑”
-47190 【20版本】创建无产品无迭代项目报错
-47180 【20版本】待处理研发需求搜索表单下拉项显示了“所属路标”
-47177 【20版本】复制项目可以修改项目类型
-47036 【20版本】多分支产品批量提Bug页面项目和执行的逻辑取决了1.5及级导航
-47021 【20版本】待处理需求/Bug/用例搜索表单下拉中显示空项
-46997 【20版本】ID搜索显示的对象不正确
-46757 【20版本】升级后默认给之前的Bug截止提起设置为0000-00-00
-46450 【20版本】零用例需求批量编辑时，二级导航高亮缺失
+42274 【20版本】点击已保存的查询条件后没有自动显示
+42305 【20版本】创建任务默认类型为设计，建议更新为开发
+42306 【20版本】执行研发需求导出弹窗页导出字段中显示了平台/分支
+42405 【20版本】修改日志内容后弹窗没有更新
+42460 【20版本】地盘仪表盘区块的问号提示闪动
+42486 【20版本】项目仪表盘[今年完成]迭代统计数量不正确
+42583 【20版本】用例导图模式下点返回后到了列表视图下
+42772 【20版本】迭代燃尽图横坐标名应该在横坐标后面
+42774 【20版本】透视表左侧产品汇总列表建议与顶部产品标签对齐
+42778 【20版本】透视表左侧表名及内容建议与“更多精彩”广告语添加间隔
+42994 【20版本】批量删除用例库用例没有二次提醒
+43075 【20版本】项目关闭和激活的窗口显示过长
+43077 【20版本】BI的1.5级导航背景色显示有误
+43214 【20版本】项目发布下修改附件名称保存后跳转到了发布的需求列表
+43256 【20版本】项目列表按预算排序不正确
+43269 【20版本】上传php附件时未出现风险提示
+43334 【20版本】接口空间接口详情页左侧标签和二级导航重叠
+43438 【20版本】用例或者场景无法拖动
+43504 【20版本】可关联的需求列表显示不友好
+43519 【20版本】专业研发看板下设置背景色弹窗中样式不对
+43625 【20版本】新手教程部分页面未校验必填
+44519 【20版本】地盘仪表盘欢迎总览区块指派给我的任务数和待处理模块不一致
+44524 【20版本】地盘仪表盘使用帮助区块中，鼠标悬浮的样式奇怪
+44528 【20版本】融合敏捷-项目型创建迭代页面“关联计划”没有对齐
+44530 【20版本】执行维护团队列表没有对齐
+44550 【20版本】融合瀑布-项目型编辑页面不应该展示阶段类型
+44566 【20版本】文档版本的位置不对
+44581 【20版本】勾选待定后，预算单位也只读了
+44591 【20版本】项目列表保存搜索条件，无效
+44592 【20版本】产品列表选择某一项目集后，切换回所有项目集的交互异常
+44597 【20版本】项目列表的搜索，这个按钮点了会闪
+44605 【20版本】项目列表选“全部”，选一个项目点删除，删完跳到了“进行中”
+44626 【20版本】项目的历史记录，汉化不完整
+44635 【20版本】创建泳道的泳道颜色样式需优化
+44667 【20版本】创建项目页，权限交互操作范围过大
+44681 【20版本】编辑泳道的泳道颜色样式需优化
+44689 【20版本】创建执行固定团队名称字段后，勾选复制团队后未显示复制团队字段
+44691 【20版本】审批按钮语义不清晰
+44694 【20版本】地盘动态的背景太暗了
+44743 【20版本】项目集白名单选择权限组后，项目集白名单内无白名单人员展示
+44809 【20版本】禅道客户端未兼容20版本
+44852 【20版本】产品计划搜索条件顺序错误
+44870 【20版本】执行总览中执行总量的数据和列表对不上
+44871 【20版本】敏捷项目-产品型-有迭代不能关联其他产品
+44885 【20版本】瀑布和融合瀑布项目于产品解除关联的逻辑未修改
+44895 【20版本】发布详情中切换的文字样式不对
+44899 【20版本】看板项目在设置-产品新关联产品没有历史记录
+44906 【20版本】项目导出数据选择导出字段下拉框超出弹窗
+44915 【20版本】项目发布的通知弹窗字段没有居左对齐
+44923 【20版本】给项目型项目创建发布时，发布名称右侧缺少里程碑的勾选
+44930 【20版本】测试单阻塞的弹窗中备注字段没有居左对齐
+44939 【20版本】批量编辑项目页面，计划结束不能选择长期
+44944 【20版本】当项目名称字段过长时，项目列表的延期标签不显示
+44950 【20版本】在小屏批量创建任务时，表单底部横向滚动条被遮挡
+44992 【20版本】执行关联产品页面热区太小
+44993 【20版本】接口空间的版本管理样式需要优化
+45003 【20版本】项目集产品视角列表编辑产品选项缺失
+45032 【20版本】测试下提bug表单中维护模块时，点击产品跳转链接不正确
+45048 【20版本】用例列表自动化测试用例标签颜色
+45062 【20版本】后台二开编辑器页面列表标题和缩进样式有误
+45079 【20版本】瀑布项目统计区块中进度偏差率和成本偏差率的背景颜色太暗
+45083 【20版本】用例列表区块没有数据时，中间多了一条横线
+45098 【20版本】创建融合瀑布项目，复制项目后，提示语不展示
+45104 【20版本】复制执行的样式和需求不一致
+45109 【20版本】创建执行选择运维迭代时未添加提示语
+45132 【20版本】创建执行页，同一个产品可以重复选择，且提示语不对
+45151 【20版本】编辑融合瀑布项目的自建测试阶段切换阶段类型为需求后，编辑前创建的阶段下Bug显示所属执行已删除
+45154 【20版本】删除阶段弹窗样式与20版本规范不一致
+45157 【20版本】任务详情页中研发需求有变更时左侧缺少确认按钮
+45163 【20版本】树状图和20版本需求样式不同
+45168 【20版本】创建好执行后的提示语不对
+45210 【20版本】设置看板泳道颜色的显示样式有误
+45351 【20版本】产品计划删除计划提示弹窗样式未更新为最新
+45541 【20版本】创建泳道时泳道颜色按钮样式异常
+45552 【20版本】待处理-用例下执行用例，执行结果为失败，关闭弹窗没有刷新页面
+45780 【20版本】项目集年度新增数据汇总表文档数没有统计项目和执行下的数据
+45916 【20版本】测试单下批量执行用例建议增加提示信息
+45936 【20版本】执行看板中转入任务弹窗中部分内容未添加英文语言项
+46013 【20版本】个人面板下拉被遮挡
+46027 【20版本】员工负载表字段显示不完整
+46090 【20版本】后台设置关闭软需备注为必填项关闭需求时设置不生效
+46099 【20版本】新手教程项目概况页面有报错
+46209 【20版本】测试用例页面报错
+46259 【20版本】关联代码库页面字段展示空白
46397 【20版本】创建联系人页面列表名称和选择用户字段没有必填项标识
+46413 【20版本】图表前台页面显示滚动条
+46450 【20版本】零用例需求批量编辑时，二级导航高亮缺失
+46462 【20版本】套件关联用例，底部按钮被遮挡
+46464 【20版本】关联用例默认记住了上次的查询条件，导致无法获取到可关联的用例
+46466 【20版本】仅自动化下创建用例没有自动都选上自动化按钮
+46497 【20版本】子场景下有用例，父场景下还提示暂无用例
+46757 【20版本】升级后默认给之前的Bug截止提起设置为0000-00-00
+46783 【20版本】BI升级引导弹窗中，关闭按钮和图片底部边框重合
+46905 【20版本】操作文档库目录后，目录应不折叠
+46977 【20版本】有产品无迭代项目用户需求列表页显示了按照计划关联按钮
+46997 【20版本】ID搜索显示的对象不正确
+47002 【20版本】执行下任务列表转入Bug时Bug详情页点击编辑或复制按钮后二级导航不对
+47004 【20版本】运营界面仪表盘目标数据不正确
+47021 【20版本】待处理需求/Bug/用例搜索表单下拉中显示空项
+47036 【20版本】多分支产品批量提Bug页面项目和执行的逻辑取决了1.5及级导航
+47177 【20版本】复制项目可以修改项目类型
+47180 【20版本】待处理研发需求搜索表单下拉项显示了“所属路标”
+47190 【20版本】创建无产品无迭代项目报错
+47369 【20版本】项目和执行版本列表编辑按钮右侧显示了多余的“编辑”
+47429 【20版本】项目列表看板视图更多按钮下样式不对
+47446 【20版本】待处理用例页面有代码报错
+47448 【20版本】用例详情页“相关研发需求”文案部分遮挡
+47449 【20版本】执行下创建用例保存后出现空白页面
+47457 【20版本】项目视图下选中某个项目集后创建项目页面所属项目集为自动带出
+47493 “按产品统计的年度完成计划数”统计不到直接关闭关闭原因为已完成的计划
+47558 【20版本】接口库中创建数据结构报错
+47567 【20版本】已解决的bug批量解决后提示保存成功
+47594 【20版本】执行-bug页面报错
+47640 【20版本】视野没BI权限，无法查看欢迎总览区块
+47663 【20版本】创建产品页面字段显示设置弹窗点击保存按钮没有反应
+47666 【20版本】发布下查看需求详情右侧会有重叠显示
+47667 【20版本】下载发布基本信息页面的附件提示没有权限访问
+47672 【20版本】融合瀑布项目仪表盘有报错
+47673 【20版本】项目型项目的发布通知弹窗中选项换行显示
+47675 【20版本】项目列表中勾选项目后点批量编辑按钮提示保存成功
+47679 【20版本】全局搜索结果页面分页无效
+47680 【20版本】全局搜索关键字搜索结果页面显示了二级导航
+47706 【20版本】任务记录工时保存后新增日志不能到已提交区块中
+47709 【20版本】全局搜索结果页输入ID全局搜索时搜索项重复展示
+47728 收到消息后，点击桌面底部大桌面图标后，没有定位到消息会话中
+47764 【20版本】设置过阶段工作量占比的项目，后台关闭该功能后，融合瀑布项目设置阶段页面的工作量占比字段依然显示
+47840 【20版本】批量添加用户时默认显示一行
+47841 【20版本】产品下创建研发需求后二级导航错乱
+47842 【20版本】无法删除产品模块
+47843 【20版本】瀑布项目设置阶段保存后有报错
+47844 【20版本】xmind导出没有导出3级用例
+47845 【20版本】测试单用例报表不显示柱状图和折线图
+47846 【20版本】创建子计划勾选待定后依然校验了超出父计划的范围
+47847 【20版本】研发需求详情页未显示研发需求细分按钮
+47848 【20版本】创建测试报告页面代码报错
+47849 【20版本】计划看板视图卡片中的更多按钮点击后不显现
+47850 目标详情页的操作按钮显示不全
+47851 【20版本】版本的编辑删除按钮显示不正确
+47852 【20版本】pms12.4.1升级20.0版本，创建有产品项目选择计划后，项目的迭代列表报错
+47853 【20版本】pms12.4.1升级20.0版本，创建无产品项目的迭代时出现报错
+47855 【20版本】研发需求变更后，关联的用例操作栏确认图标未显示
+47856 【20版本】测试视图下模块维护页面鼠标无法选中模块名称
+47857 【20版本】无产品项目下创建计划跳转到了添加产品页面
+47858 【20版本】执行版本列表和详情页缺少部分操作按钮
+47859 【20版本】用例库下编辑页面和搜索表单中显示了“所属场景”
+47860 【20版本】融合瀑布项目细分阶段选择迭代/看板时页面代码报错
+47861 【20版本】升级时一致性检查报错
+47863 【20版本】用例库用例详情页显示多余的分割线
+47864 【20版本】代码关联任务页面点击搜索后有代码报错
+47865 【20版本】透视表页有报错
+47867 【20版本】系统无产品时，代码库页面的提示不对
+47868 【20版本】无产品项目列表中，关联产品按钮仍然高亮
+47869 【20版本】度量项切换分页后有报错
+47870 【20版本】20beta2版本升级到20版本，文心一言语言模型供应商的值有误
+47872 【20版本】接口文档详情页刷新页面后点击返回按钮无响应
+47873 【20版本】DevOps代码库页面不显示创建和关联代码库的按钮
+47876 【20版本】全局提词使用时，报错：API 返回值为空或返回了错误
+47877 【20版本】项无产品添加计划页面点击返回跳转到了添加产品页面
+47878 【20版本】[未解决bug指派表]表头缺少中文语言项
+47880 【20版本】客户端初始化左侧导航栏有重叠
+47882 【20版本】图表无条件点击查询后不再展示图表
+47883 【20版本】编辑用例步骤拖拽排序不生效
+47886 【20版本】编辑用例步骤宽度不够
+47887 【20版本】新手教程顶部出现了白条
+47889 【20版本】鼠标拖动无法选中内容
+47890 【20版本】用例关联的需求变更后，用例详情页确认按钮被遮挡
+47892 【20版本】左侧导航右键菜单空白了
+47893 【20版本】用例详情页点击需求弹窗中的按钮，以页面形式打开
+47894 【20版本】度量项中日期不显示月和日
+47895 【20版本】登录时填写系统不存在用户名时点击登录没有提示
+47896 【20版本】用例详情页点击需求弹窗中的撤销评审按钮，弹窗未刷新
+47897 【20版本】编辑待定状态的子计划，修改结束日期后保存，子计划仍然是待定状态
+47898 【20版本】添加GitFox应用保存时提示文案不对
+47899 【20版本】从用例库导入用例列表进入用例详情页后操作按钮缺失
+47901 【20版本】安装导入demo数据有报错
+47903 【20版本】测试报告详情页悬浮不展示按钮名
+47905 【20版本】编辑测试单页面不显示页面title
+47906 【20版本】待处理下编辑测试单页面保存按钮显示成了“编辑测试单”
+47907 【20版本】待处理下测试单概况页点击编辑后二级导航未高亮
+47908 【20版本】批量执行用例有报错
+47910 【20版本】项目版本列表有代码报错
+47911 【20版本】没有部分项目操作权限时，项目列表的操作栏中仍然高亮相应的操作按钮
+47913 【20版本】上传文件过大的提示信息中显示%s
+47914 【20版本】批量添加用户，密码输入框和横向滚动条重合了
+47915 【20版本】测试-bug报表图中没有显示值
+47917 【20版本】升级前有创建项目的权限，升级后没了
+47918 【20版本】创建项目集页面白名单使用联系人方式添加没有添加上
+47920 【20版本】项目研发/用户需求列表页点击模块设置时跳转不正确
+47924 【20版本】编辑模块没有负责人字段
+47925 【20版本】用需变更时没有列出影响范围
+47926 【20版本】选择模块后，指派给没默认显示模块负责人
+47930 【20版本】编辑模块页面，所属产品字段宽度不一致
+47932 【20版本】执行测试单下执行用例有报错
+47934 【20版本】用例列表查看自动化脚本报错
+47936 【20版本】执行1.5级导航都应显示项目/执行名
+47937 【20版本】批量添加任务，显示2个加载样式
+47938 【20版本】开源版显示了提词设计按钮
+47939 【20版本】创建/编辑用例页面自动化脚本处允许的文件类型不能上传
+47949 【20版本】多分支产品研发需求页面显示设置中没有显示分支的设置
+47950 【20版本】无法查看软需的相关研发需求
+47951 【20版本】软需详情页中相关研发需求没有选中样式
+47952 【20版本】自动化用例不能上传自动化脚本
+47962 导出产品列表文件中变更中显示已变更
+47965 【20版本】后台显示多余的度量项权限
+47968 【20版本】项目版本的详情页点击编辑出现zui报错
+47969 【20版本】编辑和批量编辑软需计划选择范围不一致
+47970 【20版本】开源版显示了[重置调试]权限
+47971 【20版本】项目测试下Bug转任务的弹窗中切换项目后，所属执行显示为ID
+47972 【20版本】编辑数据结构页面有报错
+47973 【20版本】版本管理弹窗页显示了无用滚动条
+47976 【20版本】没有选择模块时样式不正确
+47978 【20版本】动态页面有报错
+47979 【20版本】执行提词后，没有重新生成按钮
+47980 【20版本】上下架小程序和提词，动态中缺少中文语言项
+47983 【20版本】[产品缺陷数据汇总表]不展示数据
+47984 【20版本】没有项目时进入项目文档，索引页面显示太大
+47985 【20版本】变更研发需求，影响的项目执行数为0
+47986 【20版本】接口空间添加目录时输入框下边框遮挡
+47990 【20版本】产品空间下附件库列表需求详情页删除需求后页面和导航不对应
+47992 【20版本】透视表查看原始数据报错
+47995 【20版本】透视表、图表的分组树没有显示分组名称
+48000 【20版本】下载xxd报错
+48010 【20版本】win一键安装包首次登录后页面有代码报错
+48013 【20版本】仪表盘下未完成执行统计区块切换执行时报错
+48029 【20版本】团队下度量项未显示且进入组合查看页面报错
+48031 【20版本】导出xml格式的任务，导出的文件中含有文字格式代码
+48033 【20版本】删除模块没有保留最后一行
+48034 【20版本】客户端应用颜色有误
+48036 【20版本】1366*768分辨率下chrom浏览器中选择项目管理方式弹窗中有上下滑动条
+48039 【20版本】IPD的表常量定义应该写到config/zentaopms.php下，否则本地开源版仪表盘会报错
+48040 【20版本】创建项目集刷新页面后变为添加子项目集页面
+48041 【20版本】编辑单人任务为多人任务后团队弹窗中样式显示错误
+48043 【20版本】IPD1.3升级到IPD1.5beta1替换授权后页面空白
+48044 【20版本】项目下批量移除需求不生效
+48045 【20版本】项目/执行下可以关联父需求
+48047 【20版本】研发需求详情页代码报错
+48048 【20版本】编辑父需求后子需求不显示在父需求详情页
+48050 【20版本】无产品无迭代项目看板中批量提Bug，所属执行带出了影子执行的ID
+48051 【20版本】项目看板中批量上传研发需求多图上传失败
+48053 【20版本】设置阶段为非里程碑阶段，创建出的阶段显示了里程碑icon
+48055 【20版本】无产品无迭代项目看板中可以移除研发需求
+48056 【20版本】测试单关联用例页面代码报错
+48057 【20版本】点击删除接口空间目录动态后跳转错误
+48058 【20版本】无产品无迭代项目看板中任务导入Bug弹窗切换页码后才会出现返回按钮
+48059 【20版本】内置透视表的标题展示有误
+48060 【20版本】无产品无迭代项目中任务导入Bug页面的返回按钮跳转到了执行下
+48062 【20版本】完成任务弹窗中的“实际开始”字段没有必填标识
+48063 【20版本】全局搜索目标，点击后报错
+48064 【20版本】子研发需求详情页有报错
+48065 【20版本】执行测试单用例分组视图下移除用例时有报错
+48067 【20版本】测试用例分组视图下类型下拉中未显示“单元测试”
+48070 【20版本】目录的文件夹排序按钮不可操作
+48071 【20版本】编辑文档的目录在英文语言项下字段显示不完整
+48073 【20版本】修改度量项筛选按钮的默认、悬浮与选中的样式
+48074 【20版本】文件关联的需求显示不全
+48076 【20版本】代码文件关联任务复选框没对齐
+48078 【20版本】运营界面无法复制项目
+48079 【20版本】用例库导入csv不显示步骤和预期
+48081 【20版本】用例库用例详情页有报错
+48082 【20版本】无产品无迭代看板下建任务，弹窗跳转到了别的执行
+48084 【20版本】无迭代项目下研发需求转任务有所属执行字段
+48086 【20版本】运营界面目标设置页有报错
+48087 【20版本】运营项目下设置看板提示看板代号不能为空
+48088 【20版本】运营界面项目目标详情页有报错
+48098 【20版本】后台二次开发下左侧模块树显示了排序按钮但不可用
+48099 【20版本】linux一键包运营界面创建项目及看板，看板卡片中有代码显示
+48101 【20版本】运营管理界面编辑目标代码报错
+48102 【20版本】无产品无迭代项目用户需求细分成了子研发需求
+48103 【20版本】测试视图下Bug详情页有报错
+48104 【20版本】运营界面查看任务报表1.5级导航没有选择项目
+48105 【20版本】运营管理界面下复制项目页名称换行
+48107 【20版本】点击开始备份后F12有报错
+48111 【20版本】专业研发看板下版本列表点击提交测试/查看Bug后导航和页面不对应
+48113 【20版本】测试用例导入xmind控制台报错
+48114 【20版本】创建自动化用例后返回用例列表，自动勾选了“仅自动化”
+48116 【20版本】下载大桌面弹窗异常
+48117 【20版本】自动化用例无法执行
+48119 【20版本】全局搜索结果页面有报错
+48126 【20版本】复制用例用例名称和所属模块未带出
+48127 【20版本】用例库导入测试用例页面所属模块不应该显示必填标识
+48128 【20版本】自动化用例详情页没有执行按钮
+48130 【20版本】效能管理维度下完成项目工时透视表页点击查看原始数据后有报错
+48142 【20版本】人员批量编辑相关字段没有自动带过来
+48150 【20版本】运营管理界面下复制项目页显示2个确认按钮
+48159 【20版本】运营界面任务详情页显示了子任务按钮但不可用
+48162 【20版本】切换到研发综合界面下后显示了运营界面下的执行
+48171 【20版本】效能管理维度下完成项目工时透视表页面有报错
+48178 【20版本】执行下创建用例不显示在执行用例列表中
+48194 【20版本】脑图查看用例没列出预期
+48202 【20版本】运营界面下专业研发看板头像中文案未居中
2024-04-12 18.12
完成的需求
diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php
index a5a7cc9331..f653cfe325 100644
--- a/extension/lite/common/ext/lang/de/lite.php
+++ b/extension/lite/common/ext/lang/de/lite.php
@@ -1,4 +1,9 @@
productLink);
+list($projectModule, $projectMethod) = explode('-', $config->projectLink);
+list($executionModule, $executionMethod) = explode('-', $config->executionLink);
+
$lang->execution->common = 'Kanban';
$lang->executionCommon = 'Kanban';
$lang->task->common = 'Task';
@@ -72,7 +77,6 @@ $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'sub
$lang->my->menu->task = array('link' => "{$lang->task->common}|my|work|mode=task&type=assignedTo", 'subModule' => 'task');
$lang->my->menu->contacts = array('link' => "{$lang->contact->common}|my|managecontacts|");
-global $config;
if($config->edition != 'open') $lang->my->menu->effort = array('link' => 'Effort|effort|calendar|', 'exclude' => 'my-todo');
/* My menu order. */
@@ -194,7 +198,6 @@ $lang->createObjects['kanban'] = 'Kanban';
$lang->createIcons['execution'] = 'kanban';
/* Xuan */
-global $config;
if(isset($config->xuanxuan) && strpos($config->visions, ',rnd,') === false)
{
$lang->xuanxuan = new stdclass();
diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php
index a5a7cc9331..f653cfe325 100644
--- a/extension/lite/common/ext/lang/en/lite.php
+++ b/extension/lite/common/ext/lang/en/lite.php
@@ -1,4 +1,9 @@
productLink);
+list($projectModule, $projectMethod) = explode('-', $config->projectLink);
+list($executionModule, $executionMethod) = explode('-', $config->executionLink);
+
$lang->execution->common = 'Kanban';
$lang->executionCommon = 'Kanban';
$lang->task->common = 'Task';
@@ -72,7 +77,6 @@ $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'sub
$lang->my->menu->task = array('link' => "{$lang->task->common}|my|work|mode=task&type=assignedTo", 'subModule' => 'task');
$lang->my->menu->contacts = array('link' => "{$lang->contact->common}|my|managecontacts|");
-global $config;
if($config->edition != 'open') $lang->my->menu->effort = array('link' => 'Effort|effort|calendar|', 'exclude' => 'my-todo');
/* My menu order. */
@@ -194,7 +198,6 @@ $lang->createObjects['kanban'] = 'Kanban';
$lang->createIcons['execution'] = 'kanban';
/* Xuan */
-global $config;
if(isset($config->xuanxuan) && strpos($config->visions, ',rnd,') === false)
{
$lang->xuanxuan = new stdclass();
diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php
index a5a7cc9331..f653cfe325 100644
--- a/extension/lite/common/ext/lang/fr/lite.php
+++ b/extension/lite/common/ext/lang/fr/lite.php
@@ -1,4 +1,9 @@
productLink);
+list($projectModule, $projectMethod) = explode('-', $config->projectLink);
+list($executionModule, $executionMethod) = explode('-', $config->executionLink);
+
$lang->execution->common = 'Kanban';
$lang->executionCommon = 'Kanban';
$lang->task->common = 'Task';
@@ -72,7 +77,6 @@ $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'sub
$lang->my->menu->task = array('link' => "{$lang->task->common}|my|work|mode=task&type=assignedTo", 'subModule' => 'task');
$lang->my->menu->contacts = array('link' => "{$lang->contact->common}|my|managecontacts|");
-global $config;
if($config->edition != 'open') $lang->my->menu->effort = array('link' => 'Effort|effort|calendar|', 'exclude' => 'my-todo');
/* My menu order. */
@@ -194,7 +198,6 @@ $lang->createObjects['kanban'] = 'Kanban';
$lang->createIcons['execution'] = 'kanban';
/* Xuan */
-global $config;
if(isset($config->xuanxuan) && strpos($config->visions, ',rnd,') === false)
{
$lang->xuanxuan = new stdclass();
diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index 362af7c3bf..b7cbf9e966 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -1,4 +1,9 @@
productLink);
+list($projectModule, $projectMethod) = explode('-', $config->projectLink);
+list($executionModule, $executionMethod) = explode('-', $config->executionLink);
+
$lang->execution->common = '看板';
$lang->executionCommon = '看板';
$lang->task->common = '任务';
@@ -72,7 +77,6 @@ $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'sub
$lang->my->menu->task = array('link' => "{$lang->task->common}|my|contribute|mode=task&type=assignedTo", 'subModule' => 'task');
$lang->my->menu->contacts = array('link' => "{$lang->contact->common}|my|managecontacts|");
-global $config;
if($config->edition != 'open') $lang->my->menu->effort = array('link' => '日志|effort|calendar|', 'exclude' => 'my-todo');
/* My menu order. */
@@ -195,7 +199,6 @@ $lang->createObjects['kanban'] = '通用看板';
$lang->createIcons['execution'] = 'kanban';
/* Xuan */
-global $config;
if(isset($config->xuanxuan) && strpos($config->visions, ',rnd,') === false)
{
$lang->xuanxuan = new stdclass();
diff --git a/extension/lite/custom/ext/lang/de/lite.php b/extension/lite/custom/ext/lang/de/lite.php
index f65e2686c7..cdb20705d0 100644
--- a/extension/lite/custom/ext/lang/de/lite.php
+++ b/extension/lite/custom/ext/lang/de/lite.php
@@ -19,6 +19,6 @@ $lang->custom->story->fields['reviewRules'] = 'Review Rules';
$lang->custom->story->fields['reviewResultList'] = 'Review Result';
$lang->custom->story->fields['review'] = 'Need Review';
-$lang->custom->execution = new stdClass();
+$lang->custom->execution = new stdclass();
$lang->custom->system = array('required');
diff --git a/extension/lite/custom/ext/lang/en/lite.php b/extension/lite/custom/ext/lang/en/lite.php
index f65e2686c7..cdb20705d0 100644
--- a/extension/lite/custom/ext/lang/en/lite.php
+++ b/extension/lite/custom/ext/lang/en/lite.php
@@ -19,6 +19,6 @@ $lang->custom->story->fields['reviewRules'] = 'Review Rules';
$lang->custom->story->fields['reviewResultList'] = 'Review Result';
$lang->custom->story->fields['review'] = 'Need Review';
-$lang->custom->execution = new stdClass();
+$lang->custom->execution = new stdclass();
$lang->custom->system = array('required');
diff --git a/extension/lite/custom/ext/lang/fr/lite.php b/extension/lite/custom/ext/lang/fr/lite.php
index f65e2686c7..cdb20705d0 100644
--- a/extension/lite/custom/ext/lang/fr/lite.php
+++ b/extension/lite/custom/ext/lang/fr/lite.php
@@ -19,6 +19,6 @@ $lang->custom->story->fields['reviewRules'] = 'Review Rules';
$lang->custom->story->fields['reviewResultList'] = 'Review Result';
$lang->custom->story->fields['review'] = 'Need Review';
-$lang->custom->execution = new stdClass();
+$lang->custom->execution = new stdclass();
$lang->custom->system = array('required');
diff --git a/extension/lite/custom/ext/lang/zh-cn/lite.php b/extension/lite/custom/ext/lang/zh-cn/lite.php
index 01c12af1d1..e272ecd7c6 100644
--- a/extension/lite/custom/ext/lang/zh-cn/lite.php
+++ b/extension/lite/custom/ext/lang/zh-cn/lite.php
@@ -19,6 +19,6 @@ $lang->custom->story->fields['reviewRules'] = '评审规则';
$lang->custom->story->fields['reviewResultList'] = '评审结果';
$lang->custom->story->fields['review'] = '评审流程';
-$lang->custom->execution = new stdClass();
+$lang->custom->execution = new stdclass();
$lang->custom->system = array('required');
diff --git a/extension/lite/project/ext/css/execution/lite.ui.css b/extension/lite/project/ext/css/execution/lite.ui.css
index 0648627757..76d95bb4ea 100644
--- a/extension/lite/project/ext/css/execution/lite.ui.css
+++ b/extension/lite/project/ext/css/execution/lite.ui.css
@@ -7,16 +7,14 @@
.kanban-card .kanban-actions .dropdown-menu.pull-right {top:31px; right: -84px; left: auto;}
.kanban-card .kanban-actions .dropdown-menu.pull-left {top:31px; right:-1px; left: auto;}
.kanban-card .kanban-desc {color: #838a9d; word-break:break-all; height: 85px; overflow: hidden; display: -webkit-box;}
-.kanban-card .kanban-members {float: left; height: 24px; line-height: 24px;}
.kanban-card .kanban-members > div {display: inline-block; height: 24px;}
.kanban-card .kanban-members > div + div {margin-left: -5px;}
-.kanban-card .kanban-members > div > .avatar {display: inline-block; width: 24px !important; height: 24px !important; line-height: 24px; margin-right: 1px;}
.kanban-card .kanban-members > span {display: inline-block; color: transparent; width: 2px; height: 2px; background-color: #8990a2; position: relative; border-radius: 50%; top: 3px; margin: 0 3px;}
.kanban-card .kanban-members > span:before,
.kanban-card .kanban-members > span:after {content: ''; display: block; position: absolute; width: 2px; height: 2px; background-color: #8990a2; top: 0; border-radius: 50%}
.kanban-card .kanban-members > span:before {left: -4px;}
.kanban-card .kanban-members > span:after {right: -4px;}
-.kanban-card .kanban-members-count {display: inline-block; margin-left: 6px; position: relative; top: 3px}
+.kanban-card .kanban-members-count {display: inline-block; position: relative; top: 3px}
.kanban-card .kanban-acl {position: absolute; right: 0px; bottom: 2px; color: #838a9d;}
.kanban-card .label.kanban-status-wait {background-color: #E5E5E5; color: #808080;}
.kanban-card .label.kanban-status-doing {background-color: #DDF4DF; color: #38B03F;}
diff --git a/extension/lite/project/ext/ui/create.html.php b/extension/lite/project/ext/ui/create.html.php
index 2826e05592..0716f7a869 100644
--- a/extension/lite/project/ext/ui/create.html.php
+++ b/extension/lite/project/ext/ui/create.html.php
@@ -217,20 +217,6 @@ modalTrigger
)
),
- to::footer
- (
- div
- (
- setClass('flex mt-4 w-full justify-center'),
- btn
- (
- setClass('px-6'),
- set::type('primary'),
- on::click($copySelectedProject),
- $lang->confirm
- )
- )
- ),
div
(
set::id('copyProjects'),
diff --git a/extension/lite/project/ext/ui/execution.html.php b/extension/lite/project/ext/ui/execution.html.php
index a876e2c4fb..46dfc22114 100644
--- a/extension/lite/project/ext/ui/execution.html.php
+++ b/extension/lite/project/ext/ui/execution.html.php
@@ -37,7 +37,7 @@ $fnGetKanbanTeams = function($kanbanID) use ($memberGroup, $users, $usersAvatar)
$teamElements[] = div
(
set::title(zget($users, $member->account)),
- userAvatar(set::avatar(zget($usersAvatar, $member->account)), set::account($member->account), set::realname(zget($member, 'realname', ''))),
+ avatar(set::src(zget($usersAvatar, $member->account)), set::text(zget($member, 'realname', '')), set::size('sm'), set::className('mr-1')),
);
}
if(count($teams) > 4) $teamElements[] = span('… ');
@@ -47,7 +47,7 @@ $fnGetKanbanTeams = function($kanbanID) use ($memberGroup, $users, $usersAvatar)
$teamElements[] = div
(
set::title(zget($users, $lastMember->account)),
- userAvatar(set::avatar(zget($usersAvatar, $lastMember->account)), set::account($lastMember->account), set::realname(zget($lastMember, 'realname', '')), set::style(array('width' => '24px', 'height' => '24px'))),
+ avatar(set::src(zget($usersAvatar, $lastMember->account)), set::text(zget($lastMember, 'realname', '')), set::size('sm')),
);
}
return $teamElements;
diff --git a/extension/lite/task/ext/config/lite.php b/extension/lite/task/ext/config/lite.php
index 076a194eab..76394495d1 100644
--- a/extension/lite/task/ext/config/lite.php
+++ b/extension/lite/task/ext/config/lite.php
@@ -12,5 +12,5 @@ $config->task->dtable->fieldList['lane']['sortType'] = false;
$config->task->dtable->fieldList['name']['data-toggle'] = 'modal';
$config->task->dtable->fieldList['name']['data-size'] = 'lg';
-$config->task->view->operateList['main'] = array('assignTo', 'start', 'restart', 'recordWorkhour', 'pause', 'finish', 'activate', 'close', 'cancel');
-$config->task->view->operateList['common'] = array('edit', 'delete', 'view');
+$config->task->actions->view['mainActions'] = array('assignTo', 'start', 'restart', 'recordWorkhour', 'pause', 'finish', 'activate', 'close', 'cancel');
+$config->task->actions->view['suffixActions'] = array('edit', 'delete', 'view');
diff --git a/extension/xuanxuan/extension/xuan/index/ext/ui/index.xuanxuan.html.hook.php b/extension/xuanxuan/extension/xuan/index/ext/ui/index.xuanxuan.html.hook.php
index 42d48b8470..38c7df8242 100644
--- a/extension/xuanxuan/extension/xuan/index/ext/ui/index.xuanxuan.html.hook.php
+++ b/extension/xuanxuan/extension/xuan/index/ext/ui/index.xuanxuan.html.hook.php
@@ -34,78 +34,4 @@ $(document).on('hideapp', function(e, app)
window.open('xxc://extension.zentao-integrated.hideAppMenuItem/' + encodeURIComponent(JSON.stringify({id: app.code, openedApps:Object.keys($.apps.openedApps)})));
});
-
-control->loadModel('im');
-$xxdStatus = $im->getXxdStatus();
-if(isset($config->xuanxuan->turnon) && $config->xuanxuan->turnon && $xxdStatus == 'online')
-{
- $xuanConfig = new stdclass();
- $token = $im->userGetAuthToken($app->user->id, 'zentaoweb');
- $clientUrl = isset($config->webClientUrl) ? $config->webClientUrl : 'data/xuanxuan/web/index.html';
- $backendUrl = $im->getServer('zentao');
-
- $xuanConfig->clientUrl = $clientUrl;
- $xuanConfig->server = ($config->xuanxuan->https == 'on' ? 'https' : 'http') . '://' . parse_url($backendUrl, PHP_URL_HOST) . ':' . $config->xuanxuan->commonPort;
- $xuanConfig->account = $app->user->account;
- $xuanConfig->authKey = $token->token;
- $xuanConfig->debug = $config->debug;
-}
-?>
-
-
-getWebRoot() . 'data/xuanxuan/sdk/sdk.min.js'); ?>
-
-getClientLang()); ?>
-
-
diff --git a/extension/xuanxuan/extension/xuan/user/ext/lang/en/xuanxuan.php b/extension/xuanxuan/extension/xuan/user/ext/lang/en/xuanxuan.php
index d2a3bc7ac6..3fb99baddd 100644
--- a/extension/xuanxuan/extension/xuan/user/ext/lang/en/xuanxuan.php
+++ b/extension/xuanxuan/extension/xuan/user/ext/lang/en/xuanxuan.php
@@ -1,7 +1,7 @@
user->tokenInvalid = "Token denied, please login with password.";
-if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') != false)
+if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') != false)
{
$lang->user->errorDeny = "Sorry, your access to %2\$s of %1\$s is denied. Please contact your Admin to get privileges.";
}
diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index 2f39a16bd8..a1eb4cfca2 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -15,6 +15,17 @@ declare(strict_types=1);
*/
class baseHelper
{
+
+ /**
+ * 已加载的目录.
+ * The loaded directories.
+ *
+ * @static
+ * @var array
+ * @access public
+ */
+ static $loadedDirs = array();
+
/**
* 设置一个对象的成员变量。
* Set the member's value of one object.
@@ -665,6 +676,7 @@ class baseHelper
static public function ls($dir, $pattern = '')
{
if(empty($dir)) return array();
+ if(isset(self::$loadedDirs[$dir][$pattern])) return self::$loadedDirs[$dir][$pattern];
$files = array();
$dir = realpath($dir);
@@ -672,7 +684,10 @@ class baseHelper
if($dir === false) return array();
if(is_dir($dir)) $files = glob($dir . DIRECTORY_SEPARATOR . '*' . $pattern);
- return empty($files) ? array() : $files;
+
+ self::$loadedDirs[$dir][$pattern] = $files ?: array();
+
+ return self::$loadedDirs[$dir][$pattern];
}
/**
diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index 77226b0b65..72a1b6e3ff 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -287,6 +287,16 @@ class baseRouter
*/
static $loadedLangs = array();
+ /**
+ * 已加载的模块.
+ * Modules loaded.
+ *
+ * @static
+ * @var array
+ * @access public
+ */
+ static $loadedModules = array();
+
/**
* 全局$lang对象。
* The global $lang object.
@@ -466,9 +476,6 @@ class baseRouter
*/
public function setClient(): void
{
- $this->setOpenApp();
- $this->setSuperVars();
-
$this->startSession();
if($this->config->framework->multiSite) $this->setSiteCode() && $this->loadExtraConfig();
@@ -480,6 +487,9 @@ class baseRouter
if($this->config->framework->multiLanguage) $this->loadLang('common');
if($this->config->framework->multiTheme) $this->setClientTheme();
+
+ $this->setOpenApp();
+ $this->setSuperVars();
}
/**
@@ -859,7 +869,7 @@ class baseRouter
$account = isset($_SESSION['user']) ? $_SESSION['user']->account : '';
if(empty($account) and isset($_POST['account'])) $account = $_POST['account'];
if(empty($account) and isset($_GET['account'])) $account = $_GET['account'];
- if(empty($account)) $account = $this->cookie->za;
+ if(empty($account) and isset($_COOKIE['za'])) $account = $_COOKIE['za'];
$vision = '';
$sql = new sql();
@@ -1308,8 +1318,9 @@ class baseRouter
{
$this->clientDevice = 'desktop';
- if($this->cookie->device == 'mobile') $this->clientDevice = 'mobile';
- if($this->cookie->device == 'desktop') $this->clientDevice = 'desktop';
+ $cookieDevice = zget($_COOKIE, 'device', 'desktop');
+ if($cookieDevice == 'mobile') $this->clientDevice = 'mobile';
+ if($cookieDevice == 'desktop') $this->clientDevice = 'desktop';
if(empty($this->cookie->device) || !str_contains('mobile,desktop', (string) $this->cookie->device))
{
@@ -2917,30 +2928,35 @@ class baseRouter
* 加载语言文件，返回全局$lang对象。
* Load lang and return it as the global lang object.
*
- * @param string $moduleName the module name
+ * @param string $moduleName the module name
* @param string $appName the app name
* @access public
- * @return bool|object the lang object or false.
+ * @return object the lang object
*/
- public function loadLang(string $moduleName, string $appName = ''): bool|object
+ public function loadLang(string $moduleName, string $appName = ''): object
{
- /* 计算最终要加载的语言文件。 Get the lang files to be loaded. */
- $langFilesToLoad = $this->getMainAndExtFiles($moduleName, $appName, 'lang');
- if(empty($langFilesToLoad)) return false;
-
/* 加载语言文件。Load lang files. */
global $lang;
if(!is_object($lang)) $lang = new language();
if(!isset($lang->$moduleName)) $lang->$moduleName = new stdclass();
+ if(isset(self::$loadedModules[$moduleName])) return $lang;
+
+ self::$loadedModules[$moduleName] = $moduleName;
+
+ /* 计算最终要加载的语言文件。 Get the lang files to be loaded. */
+ $langFilesToLoad = $this->getMainAndExtFiles($moduleName, $appName, 'lang');
+ if(empty($langFilesToLoad)) return $lang;
+
foreach($langFilesToLoad as $langFile)
{
- if(in_array($langFile, self::$loadedLangs)) continue;
+ if(isset(self::$loadedLangs[$langFile])) continue;
include $langFile;
- self::$loadedLangs[] = $langFile;
+ self::$loadedLangs[$langFile] = $langFile;
}
$this->lang = $lang;
+
return $lang;
}
diff --git a/framework/helper.class.php b/framework/helper.class.php
index 4cd5e1cd5a..02022d66c3 100644
--- a/framework/helper.class.php
+++ b/framework/helper.class.php
@@ -717,8 +717,8 @@ function initItemActions(object &$item, string $actionMenu, array $actionList, o
$module = $actionConfig['url']['module'];
if(!$notLoadModel)
{
- $rowModule = $module == 'projectbuild' ? 'build' : $module;
- $model = $app->control->loadModel($rowModule);
+ $rawModule = $module == 'projectbuild' ? 'build' : $module;
+ $model = $app->control->loadModel($rawModule);
}
}
diff --git a/framework/router.class.php b/framework/router.class.php
index cdb6070d0d..76b6733c95 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -122,9 +122,9 @@ class router extends baseRouter
* @param string $moduleName the module name
* @param string $appName the app name
* @access public
- * @return bool|object the lang object or false.
+ * @return object the lang object or false.
*/
- public function loadLang($moduleName, $appName = ''): bool|object
+ public function loadLang($moduleName, $appName = ''): object
{
global $lang;
if(!is_object($lang)) $lang = new language();
@@ -296,7 +296,7 @@ class router extends baseRouter
$config->executionLink = 'execution-task';
/* Get user preference. */
- $account = $this->session->user->account ?? '';
+ $account = $_SESSION['user']->account ?? '';
$userSetting = array();
if($this->dbh and !empty($this->config->db->name) and $account)
{
diff --git a/lib/sqlparser/vendor/composer/platform_check.php b/lib/sqlparser/vendor/composer/platform_check.php
index 589e9e770b..7f2efc1a1a 100644
--- a/lib/sqlparser/vendor/composer/platform_check.php
+++ b/lib/sqlparser/vendor/composer/platform_check.php
@@ -4,7 +4,7 @@
$issues = array();
-if (!(PHP_VERSION_ID >= 70200)) {
+if (!(PHP_VERSION_ID >= 50400)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
}
diff --git a/lib/zin/wg/backbtn/v1.php b/lib/zin/wg/backbtn/v1.php
index e3fe5940db..77bfcb94bc 100644
--- a/lib/zin/wg/backbtn/v1.php
+++ b/lib/zin/wg/backbtn/v1.php
@@ -48,7 +48,7 @@ class backBtn extends btn
'bug' => 'bug-browse,project-bug,my-work,my-contribute,execution-bug,bug-view,qa-index,execution-task,product-track,execution-task,task-view,repo-view,story-change',
'testcase' => 'testcase-browse,project-testcase,my-work,my-contribute,execution-testcase,testtask-cases,testsuite-view,product-browse,testcase-view,qa-index,caselib-browse,product-track,story-change,my-index',
'testsuite' => 'testsuite-browse,testsuite-view,',
- 'testtask' => 'testtask-browse,testtask-cases,qa-index,testcase-browse,my-index',
+ 'testtask' => 'testtask-browse,testtask-cases,qa-index,testcase-browse,execution-build,my-index',
'testreport' => 'testreport-browse,project-testreport,execution-testreport,execution-testtask',
'tree' => 'product-browse,project-browse,execution-task,bug-browse,projectstory-story,host-browse,execution-story,feedback-admin,testcase-browse,caselib-browse',
'doc' => 'doc-mySpace,doc-productSpace,doc-projectSpace,doc-teamSpace,doc-view,execution-doc',
diff --git a/lib/zin/wg/docmenu/js/v1.js b/lib/zin/wg/docmenu/js/v1.js
index 0eab0a6c47..53f3cda4be 100644
--- a/lib/zin/wg/docmenu/js/v1.js
+++ b/lib/zin/wg/docmenu/js/v1.js
@@ -65,7 +65,7 @@ window.addModule = function(id, addType)
document.getElementById("moduleName").addEventListener('blur', saveModule);
document.getElementById("moduleName").addEventListener('keydown', function(e)
{
- if(e.keyCode == 13) saveModule.call(this);
+ if(e.keyCode == 13) e.target.blur();
});
}, 1);
}
diff --git a/misc/ci/Jenkinsfile b/misc/ci/Jenkinsfile
index a7119e5de5..319bcfc3d8 100644
--- a/misc/ci/Jenkinsfile
+++ b/misc/ci/Jenkinsfile
@@ -185,6 +185,15 @@ pipeline {
}
}
+ stage("xuan") {
+ steps {
+ container('package') {
+ sh 'cd $SRC_ZENTAOEXT_PATH && make xuan'
+ sh 'cd $SRC_ZENTAOEXT_PATH && make encrypt-xuan UUID=`uuidgen`'
+ }
+ }
+ }
+
stage("中转") {
steps {
container('package') {
diff --git a/module/account/config/form.php b/module/account/config/form.php
index ade8db8d40..fc30a45e93 100644
--- a/module/account/config/form.php
+++ b/module/account/config/form.php
@@ -1,5 +1,4 @@
account->form = new stdclass();
$config->account->form->create = array();
$config->account->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
@@ -12,7 +11,6 @@ $config->account->form->create['mobile'] = array('type' => 'string', 'requi
$config->account->form->create['type'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
$config->account->form->create['status'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
$config->account->form->create['extra'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->account->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->account->form->edit = array();
@@ -26,5 +24,4 @@ $config->account->form->edit['mobile'] = array('type' => 'string', 'required
$config->account->form->edit['type'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
$config->account->form->edit['status'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
$config->account->form->edit['extra'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->account->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
diff --git a/module/account/control.php b/module/account/control.php
index 38454784b9..6f26839022 100644
--- a/module/account/control.php
+++ b/module/account/control.php
@@ -63,7 +63,9 @@ class account extends control
{
if($_POST)
{
- $account = form::data($this->config->account->form->create)->get();
+ $account = form::data($this->config->account->form->create)
+ ->add('createdBy', $this->app->user->account)
+ ->get();
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->account->create($account);
@@ -90,7 +92,9 @@ class account extends control
{
if($_POST)
{
- $account = form::data($this->config->account->form->edit)->get();
+ $account = form::data($this->config->account->form->edit)
+ ->add('editedBy', $this->app->user->account)
+ ->get();
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->account->update($accountID, $account);
diff --git a/module/action/model.php b/module/action/model.php
index 84c71827dc..5cbd72d371 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -319,10 +319,14 @@ class actionModel extends model
}
}
+ if(isset($typeTrashes['execution'])) $noMultipleExecutions = $this->dao->select('id')->from(TABLE_EXECUTION)->where('multiple')->eq('0')->andWhere('id')->in($typeTrashes['execution'])->fetchPairs();
+
/* 将对象名称字段添加到回收站数据中。 */
/* Add name field to the trashes. */
- foreach($trashes as $trash)
+ foreach($trashes as $key => $trash)
{
+ if($trash->objectType == 'execution' && isset($noMultipleExecutions[$trash->objectID])) unset($trashes[$key]);
+
if($trash->objectType == 'pipeline' && isset($objectNames['gitlab'][$trash->objectID])) $trash->objectType = 'gitlab';
if($trash->objectType == 'pipeline' && isset($objectNames['jenkins'][$trash->objectID])) $trash->objectType = 'jenkins';
@@ -1951,6 +1955,10 @@ class actionModel extends model
$productID = $this->loadModel('product')->getProductIDByProject($object->id);;
$this->dao->update(TABLE_PRODUCT)->set('name')->eq($object->name)->set('deleted')->eq(0)->where('id')->eq($productID)->exec();
}
+
+ /* 恢复隐藏执行。 */
+ /* Resotre hidden execution. */
+ if($action->objectType == 'project' && !$object->multiple) $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq('0')->where('project')->eq($object->id)->andWhere('multiple')->eq('0')->exec();
}
if($action->objectType == 'doc' && $object->files) $this->dao->update(TABLE_FILE)->set('deleted')->eq('0')->where('id')->in($object->files)->exec();
diff --git a/module/aiapp/js/square.ui.js b/module/aiapp/js/square.ui.js
index ee104baa38..ce7af33c54 100644
--- a/module/aiapp/js/square.ui.js
+++ b/module/aiapp/js/square.ui.js
@@ -19,5 +19,6 @@ window.aiSquare.handleStarBtnClick = function(e)
$btn.children('img').attr('src', 'static/svg/star-empty.svg');
$btn.attr('data-url', $btn.attr('data-url').replace('true', 'false'));
}
+ if(category == 'collection') loadCurrentPage();
}, 'json');
};
diff --git a/module/aiapp/ui/square.html.php b/module/aiapp/ui/square.html.php
index 0d60f7bd99..a50c819245 100644
--- a/module/aiapp/ui/square.html.php
+++ b/module/aiapp/ui/square.html.php
@@ -3,6 +3,8 @@ declare(strict_types=1);
namespace zin;
+jsVar('category', $category);
+
$navItems = array();
$showTag = in_array($category, array('collection', 'discovery', 'latest'));
diff --git a/module/artifactrepo/config/form.php b/module/artifactrepo/config/form.php
index 2717a607d1..864b8521a2 100644
--- a/module/artifactrepo/config/form.php
+++ b/module/artifactrepo/config/form.php
@@ -1,7 +1,6 @@
artifactrepo->form = new stdclass();
$config->artifactrepo->form->create = array();
$config->artifactrepo->form->create['name'] = array('required' => true, 'type' => 'string');
@@ -11,12 +10,9 @@ $config->artifactrepo->form->create['type'] = array('required' => true,
$config->artifactrepo->form->create['status'] = array('required' => true, 'type' => 'string');
$config->artifactrepo->form->create['products'] = array('required' => false, 'type' => 'array', 'default' => array(), 'filter' => 'join');
$config->artifactrepo->form->create['format'] = array('required' => false, 'type' => 'string', 'default' => '');
-$config->artifactrepo->form->create['createdBy'] = array('required' => false, 'type' => 'string', 'default' => $app->user->account);
-$config->artifactrepo->form->create['editedBy'] = array('required' => false, 'type' => 'string', 'default' => $app->user->account);
$config->artifactrepo->form->create['createdDate'] = array('required' => false, 'type' => 'string', 'default' => helper::now());
$config->artifactrepo->form->edit = array();
$config->artifactrepo->form->edit['name'] = array('required' => true, 'type' => 'string');
$config->artifactrepo->form->edit['products'] = array('required' => false, 'type' => 'array', 'default' => array(), 'filter' => 'join');
-$config->artifactrepo->form->edit['editedBy'] = array('required' => false, 'type' => 'string', 'default' => $app->user->account);
$config->artifactrepo->form->edit['editedDate'] = array('required' => false, 'type' => 'string', 'default' => helper::now());
diff --git a/module/artifactrepo/control.php b/module/artifactrepo/control.php
index 2f26a03487..683cebed88 100644
--- a/module/artifactrepo/control.php
+++ b/module/artifactrepo/control.php
@@ -56,7 +56,9 @@ class artifactrepo extends control
{
if($_POST)
{
- $repo = form::data($this->config->artifactrepo->form->create)->get();
+ $repo = form::data($this->config->artifactrepo->form->create)
+ ->add('createdBy', $this->app->user->account)
+ ->get();
if($repo->products) $repo->products = ',' . $repo->products . ',';
$repoID = $this->artifactrepo->create($repo);
@@ -85,7 +87,9 @@ class artifactrepo extends control
{
if($_POST)
{
- $repo = form::data($this->config->artifactrepo->form->edit)->get();
+ $repo = form::data($this->config->artifactrepo->form->edit)
+ ->add('editedBy', $this->app->user->account)
+ ->get();
if($repo->products) $repo->products = ',' . $repo->products . ',';
$this->artifactrepo->update($repo, $artifactRepoID);
diff --git a/module/backup/model.php b/module/backup/model.php
index bcfa92ccd3..852d7f89be 100644
--- a/module/backup/model.php
+++ b/module/backup/model.php
@@ -326,7 +326,11 @@ class backupModel extends model
public function getBackupDirProgress(string $backup): array
{
$tmpLogFile = $this->getTmpLogFile($backup);
- if(file_exists($tmpLogFile)) return json_decode(file_get_contents($tmpLogFile), true);
+ if(file_exists($tmpLogFile))
+ {
+ $log = json_decode(file_get_contents($tmpLogFile), true);
+ return empty($log) ? array() : $log;
+ }
return array();
}
@@ -433,8 +437,9 @@ class backupModel extends model
public function getDirSize(string $dir): int
{
if(!file_exists($dir)) return 0;
+ if(!is_readable($dir)) return 0;
$totalSize = 0;
- $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS));
+ $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::LEAVES_ONLY, RecursiveIteratorIterator::CATCH_GET_CHILD);
foreach($iterator as $file) $totalSize += $file->getSize();
return $totalSize;
diff --git a/module/block/css/guideblock.ui.css b/module/block/css/guideblock.ui.css
index 1a3cb4fd4a..e7bec74c24 100644
--- a/module/block/css/guideblock.ui.css
+++ b/module/block/css/guideblock.ui.css
@@ -13,7 +13,7 @@
.guide-block .flowchart .flow-item > div:before {border-left-color: #fff; z-index: 1;}
.guide-block .flowchart .flow-item > div > div {display: flow-root; overflow: hidden;}.ie-8 .flow-item > div {margin-right: 10px}.flow-item-0 > div {color: #FFF; font-weight: 400;}
.guide-block .flowchart .flow-item-0 > div:before {display: none;}
-.guide-block .flowchart {.flow-item-1, .flow-item-2, .flow-item-3, .flow-item-4, .flow-item-5 {background-image: url('static/svg/arrow-white.svg');}}
+.guide-block .flowchart .flow-item-arrow {background-image: url('static/svg/arrow-white.svg');}
.guide-block .flowchart .flow-item-display {overflow: hidden; white-space:nowrap; text-overflow: clip; font-size: 12px;}
.guide-block .theme-switch div.theme-default {color: #3785ff;}
diff --git a/module/block/ui/assigntomeblock.html.php b/module/block/ui/assigntomeblock.html.php
index 92bdef8632..20412dd0aa 100644
--- a/module/block/ui/assigntomeblock.html.php
+++ b/module/block/ui/assigntomeblock.html.php
@@ -88,14 +88,15 @@ foreach($hasViewPriv as $type => $bool)
$statusList = array();
foreach($data as $review)
{
- $review->module = $review->type;
-
$reviewType = $review->type;
if($reviewType == 'projectreview') $reviewType = 'review';
+ $review->module = $reviewType;
+
$typeName = '';
if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
if($reviewType == 'story') $typeName = $review->storyType == 'story' ? $lang->SRCommon : $lang->URCommon;
+ if($review->type == 'projectreview') $typeName = $lang->project->common;
if(isset($lang->$reviewType->statusList)) $statusList = array_merge($statusList, $lang->$reviewType->statusList);
if($reviewType == 'attend') $statusList = array_merge($statusList, $lang->attend->reviewStatusList);
diff --git a/module/block/ui/executionstatisticblock.html.php b/module/block/ui/executionstatisticblock.html.php
index d219e23ed2..6dbd1d7361 100644
--- a/module/block/ui/executionstatisticblock.html.php
+++ b/module/block/ui/executionstatisticblock.html.php
@@ -254,7 +254,7 @@ statisticBlock
),
set::block($block),
set::active($active),
- set::moreLink(createLink('execution', 'all', 'status=' . $block->params->type)),
+ set::moreLink(createLink('execution', 'all', 'status=' . zget($block->params, 'type', ''))),
set::items($items),
$blockView,
);
diff --git a/module/block/ui/flowchart.html.php b/module/block/ui/flowchart.html.php
index 698b589b39..bd46ae2a6c 100644
--- a/module/block/ui/flowchart.html.php
+++ b/module/block/ui/flowchart.html.php
@@ -28,13 +28,14 @@ function printFlowchart()
{
$items[] = div
(
- set('class', 'flow-item flow-item-' . $index++),
+ set('class', "flow-item flow-item-$index " . ($index >= 1 ? 'flow-item-arrow' : '')),
div
(
set('class', 'flow-item-display'),
$flowItem
)
);
+ $index ++;
}
$charts[] = div
(
diff --git a/module/block/ui/guideblock.html.php b/module/block/ui/guideblock.html.php
index e1224c90a5..2cd8529107 100644
--- a/module/block/ui/guideblock.html.php
+++ b/module/block/ui/guideblock.html.php
@@ -95,7 +95,7 @@ blockPanel
setClass('guide-block'),
to::heading
(
- !commonModel::isTutorialMode() ? btn
+ !commonModel::isTutorialMode() && $config->vision == 'rnd' ? btn
(
set::url('tutorial', 'start'),
set::type('warning'),
diff --git a/module/block/zen.php b/module/block/zen.php
index 1e3e38ff1d..f1e20310f3 100644
--- a/module/block/zen.php
+++ b/module/block/zen.php
@@ -2012,7 +2012,7 @@ class blockZen extends block
if(common::hasPriv('todo', 'view')) $hasViewPriv['todo'] = true;
if(common::hasPriv('demand', 'view') && $this->config->edition == 'ipd' && $this->config->vision == 'or') $hasViewPriv['demand'] = true;
- if(common::hasPriv('task', 'view')) $hasViewPriv['task'] = true;
+ if((common::hasPriv('task', 'view') && $this->config->vision == 'rnd') || (common::hasPriv('marketresearch', 'viewTask') && $this->config->vision == 'or')) $hasViewPriv['task'] = true;
if(common::hasPriv('story', 'view') && $this->config->vision != 'lite') $hasViewPriv['story'] = true;
if($this->config->URAndSR && common::hasPriv('story', 'view') && $this->config->vision != 'lite') $hasViewPriv['requirement'] = true;
if(common::hasPriv('bug', 'view') && !in_array($this->config->vision, array('lite', 'or'))) $hasViewPriv['bug'] = true;
@@ -2147,6 +2147,9 @@ class blockZen extends block
$this->view->depts = $this->loadModel('dept')->getOptionMenu();
}
+ /* Compatible with the logic of the back button on the old page. */
+ $this->session->set('demandList', $this->createLink('my', 'index'), 'my');
+
$this->view->users = $this->loadModel('user')->getPairs('all,noletter');
$this->view->isExternalCall = $this->isExternalCall();
$this->view->hasViewPriv = $hasViewPriv;
diff --git a/module/bug/config.php b/module/bug/config.php
index 1fea40ed24..78baf22335 100755
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -157,6 +157,7 @@ $config->bug->actionList['delete']['hint'] = $lang->bug->delete;
$config->bug->actionList['delete']['url'] = array('module' => 'bug', 'method' => 'delete', 'params' => 'bugID={id}');
$config->bug->actionList['delete']['className'] = 'ajax-submit';
$config->bug->actionList['delete']['data-confirm'] = array('message' => $lang->bug->notice->confirmDelete, 'icon' => 'icon-exclamation-sign', 'iconClass' => 'warning-pale rounded-full icon-2x');
+$config->bug->actionList['delete']['notInModal'] = true;
$config->bug->actionList['createBranch']['icon'] = 'treemap';
$config->bug->actionList['createBranch']['hint'] = $lang->bug->codeBranch;
diff --git a/module/bug/control.php b/module/bug/control.php
index c76f8f5ebf..d79fb6d6ad 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -457,7 +457,8 @@ class bug extends control
/* Set menu. */
$this->qa->setMenu($oldBug->product, $oldBug->branch);
- $users = $this->loadModel('user')->getPairs('noclosed');
+ $users = $this->loadModel('user')->getPairs('noclosed');
+ $builds = $this->loadModel('build')->getBuildPairs(array($oldBug->product), $oldBug->branch, 'withbranch,noreleased');
/* 展示相关变量。 */
/* Show the variables associated. */
@@ -467,7 +468,7 @@ class bug extends control
$this->view->users = $users;
$this->view->assignedTo = isset($users[$oldBug->openedBy]) ? $oldBug->openedBy : $this->bug->getModuleOwner($oldBug->module, $oldBug->product);
$this->view->executions = $this->loadModel('product')->getExecutionPairsByProduct($oldBug->product, $oldBug->branch ? "0,{$oldBug->branch}" : '0', (int)$oldBug->project, 'stagefilter');
- $this->view->builds = $this->loadModel('build')->getBuildPairs(array($oldBug->product), $oldBug->branch, 'withbranch,noreleased');
+ $this->view->builds = $this->bugZen->addReleaseLabelForBuilds($oldBug->product, $builds);
$this->view->actions = $this->loadModel('action')->getList('bug', $bugID);
$this->display();
}
diff --git a/module/bug/ui/resolve.html.php b/module/bug/ui/resolve.html.php
index bf45658f27..4091802c61 100644
--- a/module/bug/ui/resolve.html.php
+++ b/module/bug/ui/resolve.html.php
@@ -92,6 +92,9 @@ formPanel
set::required(strpos(",{$config->bug->resolve->requiredFields},", ',resolvedBuild,') !== false),
picker
(
+ set::popWidth('auto'),
+ set::popMaxWidth('300px'),
+ set::popMinWidth('145px'),
set::name('resolvedBuild'),
set::value(''),
set::items($builds)
diff --git a/module/bug/zen.php b/module/bug/zen.php
index bdf67b0c0f..b454ba0d5a 100644
--- a/module/bug/zen.php
+++ b/module/bug/zen.php
@@ -995,6 +995,7 @@ class bugZen extends bug
{
$builds = $this->build->getBuildPairs(array($productID), $branch, 'noempty,noterminate,nodone,withbranch,noreleased');
}
+ $builds = $this->addReleaseLabelForBuilds($productID, $builds);
return $this->updateBug($bug, array('builds' => $builds));
}
@@ -1213,10 +1214,13 @@ class bugZen extends bug
$cases = $this->loadmodel('testcase')->getPairsByProduct($bug->product, array(0, $bug->branch), $case->title, $this->config->maxCount);
}
+ $resolvedBuilds = $this->build->getBuildPairs(array($bug->product), $bug->branch, 'noempty');
+ $resolvedBuilds = $this->addReleaseLabelForBuilds($bug->product, $resolvedBuilds);
+
$this->config->moreLinks['case'] = inlink('ajaxGetProductCases', "bugID={$bug->id}");
$this->view->openedBuilds = $openedBuilds;
- $this->view->resolvedBuilds = $this->build->getBuildPairs(array($bug->product), $bug->branch, 'noempty');
+ $this->view->resolvedBuilds = $resolvedBuilds;
$this->view->plans = $this->loadModel('productplan')->getPairs($bug->product, $bug->branch, '', true);
$this->view->stories = $bug->execution ? $this->story->getExecutionStoryPairs($bug->execution) : $this->story->getProductStoryPairs($bug->product, $bug->branch, 0, 'all', 'id_desc', 0, 'full', 'story', false);
$this->view->tasks = $this->task->getExecutionTaskPairs($bug->execution);
@@ -2398,4 +2402,32 @@ class bugZen extends bug
return $chartOption;
}
+
+ /**
+ * 给版本中的发布增加标识。
+ * Add label for the release in the builds.
+ *
+ * @param int $productID
+ * @param array $builds
+ * @access protected
+ * @return array
+ */
+ protected function addReleaseLabelForBuilds(int $productID, array $builds): array
+ {
+ $releases = $this->loadModel('build')->getRelatedReleases(array($productID));
+
+ $buildItems = array();
+ foreach($builds as $buildID => $buildName)
+ {
+ $buildItem = array('value' => $buildID, 'text' => $buildName);
+ if(isset($releases[$buildID])) $buildItem['content'] = array('html' => "{$buildName}
", 'class' => 'w-full flex nowrap');
+ $buildItems[$buildID] = $buildItem;
+ }
+ foreach($releases as $release)
+ {
+ if(isset($buildItems[$release->shadow])) $buildItems[$release->shadow]['content'] = array('html' => "{$buildItems[$release->shadow]['text']}
", 'class' => 'w-full flex nowrap');
+ }
+
+ return array_values($buildItems);
+ }
}
diff --git a/module/build/config/form.php b/module/build/config/form.php
index 0798b3274c..7b20f78dd6 100644
--- a/module/build/config/form.php
+++ b/module/build/config/form.php
@@ -17,7 +17,7 @@ $config->build->form->create['builds'] = array('type' => 'array', 'r
$config->build->form->create['bugs'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->build->form->create['stories'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->build->form->create['date'] = array('type' => 'date', 'required' => true, 'default' => helper::today());
-$config->build->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->build->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->build->form->create['createdDate'] = array('type' => 'datetime ', 'required' => false, 'default' => $now);
$config->build->form->edit['execution'] = array('type' => 'int', 'required' => $app->tab == 'execution', 'default' => 0);
diff --git a/module/build/control.php b/module/build/control.php
index 7d32f284d3..35514661d3 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -49,7 +49,7 @@ class build extends control
{
if(!empty($_POST))
{
- $build = form::data()->get();
+ $build = form::data()->setDefault('createdBy', $this->app->user->account)->get();
if(!empty($_FILES['buildFiles'])) $_FILES['files'] = $_FILES['buildFiles'];
unset($_FILES['buildFiles']);
if(dao::isError()) return $this->sendError(dao::getError());
diff --git a/module/build/model.php b/module/build/model.php
index da457dc062..426fdebbae 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -263,30 +263,8 @@ class buildModel extends model
/* if the build has been released and replace is true, replace build name with release name. */
if($replace)
{
- $releases = $this->dao->select('t1.id,t1.shadow,t1.product,t1.branch,t1.build,t1.name,t1.date,t3.name as branchName,t4.type as productType')->from(TABLE_RELEASE)->alias('t1')
- ->leftJoin(TABLE_BUILD)->alias('t2')->on('FIND_IN_SET(t2.id, t1.build)')
- ->leftJoin(TABLE_BRANCH)->alias('t3')->on('FIND_IN_SET(t3.id, t1.branch)')
- ->leftJoin(TABLE_PRODUCT)->alias('t4')->on('t1.product=t4.id')
- ->where('t1.product')->in($productIdList)
- ->beginIF(!empty($buildIdList))->andWhere('t2.id')->in($buildIdList)->fi()
- ->andWhere('t1.deleted')->eq(0)
- ->andWhere('t1.shadow')->ne(0)
- ->fetchAll('id');
-
- /* Get the buildID under the shadow product. */
- $shadows = $this->dao->select('shadow')->from(TABLE_RELEASE)->where('product')->in($productIdList)->fetchPairs('shadow', 'shadow');
- if($shadows)
- {
- /* Append releases of only shadow and not link build. */
- $releases += $this->dao->select('t1.id,t1.shadow,t1.product,t1.branch,t1.build,t1.name,t1.date,t2.name as branchName,t3.type as productType')->from(TABLE_RELEASE)->alias('t1')
- ->leftJoin(TABLE_BRANCH)->alias('t2')->on('FIND_IN_SET(t2.id, t1.branch)')
- ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
- ->where('t1.shadow')->in($shadows)
- ->andWhere('t1.build')->eq(0)
- ->andWhere('t1.deleted')->eq(0)
- ->fetchAll('id');
- }
- $builds = $this->replaceNameWithRelease($allBuilds, $builds, $releases, $branch, $params, $excludedReleaseIdList);
+ $releases = $this->getRelatedReleases($productIdList, $buildIdList, $shadows);
+ $builds = $this->replaceNameWithRelease($allBuilds, $builds, $releases, $branch, $params, $excludedReleaseIdList);
}
krsort($builds);
@@ -409,6 +387,43 @@ class buildModel extends model
return $builds;
}
+ /**
+ * 获取关联的发布。
+ * Get releated release.
+ *
+ * @param array|int $productIdList
+ * @param string $buildIdList
+ * @param array|bool $shadows
+ * @access public
+ * @return array
+ */
+ public function getRelatedReleases(array|int $productIdList, string $buildIdList = '', array|bool $shadows = false): array
+ {
+ $releases = $this->dao->select('t1.id,t1.shadow,t1.product,t1.branch,t1.build,t1.name,t1.date,t3.name as branchName,t4.type as productType')->from(TABLE_RELEASE)->alias('t1')
+ ->leftJoin(TABLE_BUILD)->alias('t2')->on('FIND_IN_SET(t2.id, t1.build)')
+ ->leftJoin(TABLE_BRANCH)->alias('t3')->on('FIND_IN_SET(t3.id, t1.branch)')
+ ->leftJoin(TABLE_PRODUCT)->alias('t4')->on('t1.product=t4.id')
+ ->where('t1.product')->in($productIdList)
+ ->beginIF(!empty($buildIdList))->andWhere('t2.id')->in($buildIdList)->fi()
+ ->andWhere('t1.deleted')->eq(0)
+ ->andWhere('t1.shadow')->ne(0)
+ ->fetchAll('id');
+
+ if($shadows === false) $shadows = $this->dao->select('shadow')->from(TABLE_RELEASE)->where('product')->in($productIdList)->fetchPairs('shadow', 'shadow'); // Get the buildID under the shadow product.
+ if($shadows)
+ {
+ /* Append releases of only shadow and not link build. */
+ $releases += $this->dao->select('t1.id,t1.shadow,t1.product,t1.branch,t1.build,t1.name,t1.date,t2.name as branchName,t3.type as productType')->from(TABLE_RELEASE)->alias('t1')
+ ->leftJoin(TABLE_BRANCH)->alias('t2')->on('FIND_IN_SET(t2.id, t1.branch)')
+ ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
+ ->where('t1.shadow')->in($shadows)
+ ->andWhere('t1.build')->eq(0)
+ ->andWhere('t1.deleted')->eq(0)
+ ->fetchAll('id');
+ }
+ return $releases;
+ }
+
/**
* 获取最后一次创建的版本信息。
* Get the last build.
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 50bc7b0e21..17fa08fb33 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -63,6 +63,7 @@ $lang->custom->setPercent = "Enable or Disable {$lang->stage->percent}
$lang->custom->beginAndEndDate = 'Begin & End';
$lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
$lang->custom->limitTaskDateAction = 'Set start and end date required';
+$lang->custom->closedSetting = 'Close Setting';
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 906fcf7911..e31d1da4ac 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -63,6 +63,7 @@ $lang->custom->setPercent = "Enable or Disable {$lang->stage->percent}
$lang->custom->beginAndEndDate = 'Begin & End';
$lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
$lang->custom->limitTaskDateAction = 'Set start and end date required';
+$lang->custom->closedSetting = 'Close Setting';
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 634a258671..15faf5be2e 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -63,6 +63,7 @@ $lang->custom->setPercent = "Enable or Disable {$lang->stage->percent}
$lang->custom->beginAndEndDate = 'Begin & End';
$lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
$lang->custom->limitTaskDateAction = 'Set start and end date required';
+$lang->custom->closedSetting = 'Close Setting';
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index f5be356858..1457012bf5 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -63,6 +63,7 @@ $lang->custom->setPercent = "是否启用{$lang->stage->percent}";
$lang->custom->beginAndEndDate = '起止日期';
$lang->custom->beginAndEndDateRange = '起止日期范围';
$lang->custom->limitTaskDateAction = '设置起止日期必填';
+$lang->custom->closedSetting = '关闭设置';
$lang->custom->unitList['efficiency'] = '工时/';
$lang->custom->unitList['manhour'] = '人时/';
diff --git a/module/custom/ui/execution.html.php b/module/custom/ui/execution.html.php
index 18b8946d46..72b44a5c42 100644
--- a/module/custom/ui/execution.html.php
+++ b/module/custom/ui/execution.html.php
@@ -25,7 +25,7 @@ div
span
(
setClass('text-md font-bold'),
- $lang->custom->$module->fields[$module]
+ $lang->custom->closedSetting
),
formGroup
(
diff --git a/module/dataview/lang/de.php b/module/dataview/lang/de.php
index 79cfcf936f..6c28aa6018 100644
--- a/module/dataview/lang/de.php
+++ b/module/dataview/lang/de.php
@@ -100,9 +100,9 @@ $lang->dataview->objects['testrun'] = 'testrun';
$lang->dataview->objects['testcase'] = 'testcase';
$lang->dataview->objects['testresult'] = 'result';
$lang->dataview->objects['casemodule'] = 'case module';
-$lang->dataview->objects['feedback'] = 'Feedback';
$lang->dataview->objects['action'] = 'Action';
$lang->dataview->objects['effort'] = 'Effort';
+if($this->config->edition != 'open') $lang->dataview->objects['feedback'] = 'Feedback';
$lang->dataview->tables = array();
$lang->dataview->tables['build'] = array('name' => 'Build', 'desc' => '');
diff --git a/module/dataview/lang/en.php b/module/dataview/lang/en.php
index 79cfcf936f..6c28aa6018 100644
--- a/module/dataview/lang/en.php
+++ b/module/dataview/lang/en.php
@@ -100,9 +100,9 @@ $lang->dataview->objects['testrun'] = 'testrun';
$lang->dataview->objects['testcase'] = 'testcase';
$lang->dataview->objects['testresult'] = 'result';
$lang->dataview->objects['casemodule'] = 'case module';
-$lang->dataview->objects['feedback'] = 'Feedback';
$lang->dataview->objects['action'] = 'Action';
$lang->dataview->objects['effort'] = 'Effort';
+if($this->config->edition != 'open') $lang->dataview->objects['feedback'] = 'Feedback';
$lang->dataview->tables = array();
$lang->dataview->tables['build'] = array('name' => 'Build', 'desc' => '');
diff --git a/module/dataview/lang/fr.php b/module/dataview/lang/fr.php
index 79cfcf936f..6c28aa6018 100644
--- a/module/dataview/lang/fr.php
+++ b/module/dataview/lang/fr.php
@@ -100,9 +100,9 @@ $lang->dataview->objects['testrun'] = 'testrun';
$lang->dataview->objects['testcase'] = 'testcase';
$lang->dataview->objects['testresult'] = 'result';
$lang->dataview->objects['casemodule'] = 'case module';
-$lang->dataview->objects['feedback'] = 'Feedback';
$lang->dataview->objects['action'] = 'Action';
$lang->dataview->objects['effort'] = 'Effort';
+if($this->config->edition != 'open') $lang->dataview->objects['feedback'] = 'Feedback';
$lang->dataview->tables = array();
$lang->dataview->tables['build'] = array('name' => 'Build', 'desc' => '');
diff --git a/module/dataview/lang/zh-cn.php b/module/dataview/lang/zh-cn.php
index 8f819c490b..ca697ec1a9 100644
--- a/module/dataview/lang/zh-cn.php
+++ b/module/dataview/lang/zh-cn.php
@@ -100,9 +100,9 @@ $lang->dataview->objects['testrun'] = '测试执行';
$lang->dataview->objects['testcase'] = '测试用例';
$lang->dataview->objects['testresult'] = '执行结果';
$lang->dataview->objects['casemodule'] = '用例模块';
-$lang->dataview->objects['feedback'] = '反馈';
$lang->dataview->objects['action'] = '动态';
$lang->dataview->objects['effort'] = '日志';
+if($this->config->edition != 'open') $lang->dataview->objects['feedback'] = '反馈';
$lang->dataview->tables = array();
$lang->dataview->tables['build'] = array('name' => '版本数据', 'desc' => '包括版本名称、所属产品、所属项目、所属执行、创建人等');
diff --git a/module/dataview/table/feedback.php b/module/dataview/table/feedback.php
new file mode 100644
index 0000000000..2bef823938
--- /dev/null
+++ b/module/dataview/table/feedback.php
@@ -0,0 +1,18 @@
+app->loadLang('feedback');
+
+$schema = new stdclass();
+
+$schema->primaryTable = 'feedback';
+
+$schema->tables = array();
+$schema->tables['feedback'] = 'zt_feedback';
+
+$schema->fields = array();
+$schema->fields['id'] = array('type' => 'number', 'name' => $this->lang->feedback->id);
+$schema->fields['type'] = array('type' => 'option', 'name' => $this->lang->feedback->type, 'options' => $this->lang->feedback->typeList);
+$schema->fields['status'] = array('type' => 'option', 'name' => $this->lang->feedback->status, 'options' => $this->lang->feedback->statusList);
+$schema->fields['closedReason'] = array('type' => 'option', 'name' => $this->lang->feedback->closedReason, 'options' => $this->lang->feedback->closedReasonList);
+$schema->fields['solution'] = array('type' => 'option', 'name' => $this->lang->feedback->solution, 'options' => $this->lang->feedback->solutionList);
+$schema->fields['public'] = array('type' => 'option', 'name' => $this->lang->feedback->public, 'options' => $this->lang->feedback->publicList);
+
diff --git a/module/dataview/table/user.php b/module/dataview/table/user.php
new file mode 100644
index 0000000000..c1bd324f4a
--- /dev/null
+++ b/module/dataview/table/user.php
@@ -0,0 +1,18 @@
+app->loadLang('user');
+$this->app->loadLang('dept');
+
+$schema = new stdclass();
+
+$schema->primaryTable = 'user';
+
+$schema->tables = array();
+$schema->tables['user'] = 'zt_user';
+$schema->tables['dept'] = 'zt_dept';
+
+$schema->joins = array();
+$schema->joins['dept'] = 'dept.id = user.dept';
+
+$schema->fields = array();
+$schema->fields['id'] = array('type' => 'number', 'name' => $this->lang->user->id);
+$schema->fields['dept'] = array('type' => 'object', 'name' => $this->lang->user->dept, 'object' => 'dept', 'show' => 'dept.name');
diff --git a/module/design/config/dtable.php b/module/design/config/dtable.php
index f9e6ef7f8b..cc6e3b32bf 100644
--- a/module/design/config/dtable.php
+++ b/module/design/config/dtable.php
@@ -26,7 +26,6 @@ $config->design->dtable->fieldList['type']['statusMap'] = $lang->design->typeLis
$config->design->dtable->fieldList['type']['sortType'] = true;
$config->design->dtable->fieldList['assignedTo']['type'] = 'assign';
-$config->design->dtable->fieldList['assignedTo']['currentUser'] = $app->user->account;
$config->design->dtable->fieldList['assignedTo']['assignLink'] = array('module' => 'design', 'method' => 'assignTo', 'params' => 'designID={id}');
$config->design->dtable->fieldList['assignedTo']['data-toggle'] = 'modal';
$config->design->dtable->fieldList['assignedTo']['sortType'] = false;
diff --git a/module/design/config/form.php b/module/design/config/form.php
index b1acd11e7e..1ba880c4c4 100644
--- a/module/design/config/form.php
+++ b/module/design/config/form.php
@@ -12,7 +12,7 @@ $config->design->form->create['project'] = array('type' => 'int', 'requ
$config->design->form->create['story'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->design->form->create['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
$config->design->form->create['version'] = array('type' => 'int', 'required' => false, 'default' => 1);
-$config->design->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->design->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->design->form->create['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->design->form->batchcreate['name'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim', 'base' => true);
@@ -22,7 +22,7 @@ $config->design->form->batchcreate['project'] = array('type' => 'int',
$config->design->form->batchcreate['story'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->design->form->batchcreate['desc'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->design->form->batchcreate['version'] = array('type' => 'int', 'required' => false, 'default' => 1);
-$config->design->form->batchcreate['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->design->form->batchcreate['createdBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->design->form->batchcreate['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->design->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
@@ -30,10 +30,10 @@ $config->design->form->edit['type'] = array('type' => 'string', 'require
$config->design->form->edit['product'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->design->form->edit['story'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->design->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
-$config->design->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->design->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->design->form->edit['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->design->form->assignto['assignedTo'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->design->form->assignto['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->design->form->assignto['editedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->design->form->assignto['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->design->form->assignto['assignedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
diff --git a/module/design/control.php b/module/design/control.php
index 23b7223940..f5e1dd04d8 100755
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -138,6 +138,7 @@ class design extends control
{
$designData = form::data()
->add('project', $projectID)
+ ->setDefault('createdBy', $this->app->user->account)
->get();
$designID = $this->design->create($designData);
@@ -247,7 +248,7 @@ class design extends control
if($_POST)
{
- $designData = form::data()->get();
+ $designData = form::data()->setDefault('editedBy', $this->app->user->account)->get();
$changes = $this->design->update($designID, $designData);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -482,7 +483,7 @@ class design extends control
{
if($_POST)
{
- $designData = form::data()->get();
+ $designData = form::data()->setDefault('editedBy', $this->app->user->account)->get();
$changes = $this->design->assign($designID, $designData);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/design/model.php b/module/design/model.php
index 0cb1ae1a04..1b189c5289 100755
--- a/module/design/model.php
+++ b/module/design/model.php
@@ -60,8 +60,9 @@ class designModel extends model
$this->loadModel('action');
foreach($designs as $rowID => $design)
{
- $design->product = $productID;
- $design->project = $projectID;
+ $design->product = $productID;
+ $design->project = $projectID;
+ $design->createdBy = $this->app->user->account;
$this->dao->insert(TABLE_DESIGN)->data($design)->autoCheck()->batchCheck($this->config->design->batchcreate->requiredFields, 'notempty')->exec();
if(dao::isError())
diff --git a/module/doc/config/form.php b/module/doc/config/form.php
index 414a49dc4b..6cb7229289 100644
--- a/module/doc/config/form.php
+++ b/module/doc/config/form.php
@@ -15,7 +15,7 @@ $config->doc->form->createlib['execution'] = array('type' => 'int', 'requir
$config->doc->form->createlib['groups'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->createlib['users'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->createlib['vision'] = array('type' => 'string', 'required' => false, 'default' => $config->vision);
-$config->doc->form->createlib['addedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->doc->form->createlib['addedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->createlib['addedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->doc->form->editlib['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
@@ -35,9 +35,9 @@ $config->doc->form->create['type'] = array('type' => 'string', 'requir
$config->doc->form->create['keywords'] = array('type' => 'string', 'required' => false, 'default' => '', 'skipRequired' => true);
$config->doc->form->create['acl'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['vision'] = array('type' => 'string', 'required' => false, 'default' => $config->vision);
-$config->doc->form->create['addedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->doc->form->create['addedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['addedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
-$config->doc->form->create['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->doc->form->create['editedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->doc->form->create['groups'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['users'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
@@ -62,5 +62,5 @@ $config->doc->form->edit['content'] = array('type' => 'string', 'required'
$config->doc->form->edit['groups'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->edit['users'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->edit['mailto'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
-$config->doc->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
+$config->doc->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->edit['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
diff --git a/module/doc/control.php b/module/doc/control.php
index 61b1afdd73..d2ec54b1f3 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -332,7 +332,11 @@ class doc extends control
helper::setcookie('lastDocModule', $moduleID);
if(!isset($_POST['lib']) && strpos($_POST['module'], '_') !== false) list($_POST['lib'], $_POST['module']) = explode('_', $_POST['module']);
- $docData = form::data()->get();
+ $docData = form::data()
+ ->setDefault('addedBy', $this->app->user->account)
+ ->setDefault('editedBy', $this->app->user->account)
+ ->get();
+
$docResult = $this->doc->create($docData, $this->post->labels);
if(!$docResult || dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
return $this->docZen->responseAfterCreate($docData->lib, $docResult);
@@ -383,7 +387,10 @@ class doc extends control
if($comment == false)
{
if(!isset($_POST['lib']) && strpos($_POST['module'], '_') !== false) list($_POST['lib'], $_POST['module']) = explode('_', $_POST['module']);
- $docData = form::data()->setIF(strpos(",$doc->editedList,", ",{$this->app->user->account},") === false, 'editedList', $doc->editedList . ",{$this->app->user->account}")->get();
+ $docData = form::data()
+ ->setDefault('editedBy', $this->app->user->account)
+ ->setIF(strpos(",$doc->editedList,", ",{$this->app->user->account},") === false, 'editedList', $doc->editedList . ",{$this->app->user->account}")
+ ->get();
$result = $this->doc->update($docID, $docData);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/doc/ui/create.html.php b/module/doc/ui/create.html.php
index ac55f0be0a..f65371b2c8 100644
--- a/module/doc/ui/create.html.php
+++ b/module/doc/ui/create.html.php
@@ -88,6 +88,7 @@ else
input
(
set::name('title'),
+ set::maxlength(100),
set::placeholder($lang->doc->titlePlaceholder)
)
),
diff --git a/module/doc/ui/edit.html.php b/module/doc/ui/edit.html.php
index bebee025bf..5dec9191ed 100644
--- a/module/doc/ui/edit.html.php
+++ b/module/doc/ui/edit.html.php
@@ -34,6 +34,7 @@ form
(
set::name('title'),
set::value($doc->title),
+ set::maxlength(100),
set::placeholder($lang->doc->titlePlaceholder)
)
),
diff --git a/module/doc/ui/view.html.php b/module/doc/ui/view.html.php
index 66b2dc1a6a..1e485bb81c 100644
--- a/module/doc/ui/view.html.php
+++ b/module/doc/ui/view.html.php
@@ -253,6 +253,7 @@ $treeDom = isset($outlineTree) ? div
setID('contentTree'),
tree
(
+ set::className('pl-4'),
set::items($outlineTree),
set::defaultNestedShow(true)
)
diff --git a/module/doc/zen.php b/module/doc/zen.php
index 012613ccf9..bec7dec4d1 100644
--- a/module/doc/zen.php
+++ b/module/doc/zen.php
@@ -79,7 +79,7 @@ class docZen extends doc
$item = array();
$item['id'] = $index;
- $item['title'] = strip_tags($headElement[3]);
+ $item['title'] = array('html' => strip_tags($headElement[3]));
$item['hint'] = strip_tags($headElement[3]);
$item['url'] = '#anchor' . $index;
$item['level'] = $currentLevel;
@@ -271,6 +271,7 @@ class docZen extends doc
{
$this->lang->doc->name = $this->lang->doclib->name;
$lib = form::data()
+ ->setDefault('addedBy', $this->app->user->account)
->setIF($this->post->type == 'product' && !empty($_POST['product']), 'product', $this->post->product)
->setIF($this->post->type == 'project' && !empty($_POST['project']), 'project', $this->post->project)
->setIF($this->post->libType != 'api' && !empty($_POST['execution']), 'execution', $this->post->execution)
diff --git a/module/execution/control.php b/module/execution/control.php
index 174b65c7b7..a0fdc5acdf 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -359,6 +359,7 @@ class execution extends control
*/
public function importBug(int $executionID = 0, string $browseType = 'all', int $param = 0, int $recTotal = 0, int $recPerPage = 30, int $pageID = 1)
{
+ $this->session->set('bugList', $this->app->getURI(true), 'execution');
$execution = $this->execution->getByID($executionID);
if(!empty($_POST))
{
@@ -1968,9 +1969,9 @@ class execution extends control
public function storyKanban(int $executionID)
{
$this->app->loadLang('kanban');
- $this->execution->setMenu($executionID);
- $execution = $this->loadModel('execution')->getByID($executionID);
- $stories = $this->loadModel('story')->getExecutionStories($executionID);
+ $execution = $this->commonAction($executionID);
+ $executionID = $execution->id;
+ $stories = $this->loadModel('story')->getExecutionStories($executionID);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
$stories = array_filter($stories, function($story) {return in_array($story->stage, $this->config->execution->storyKanbanCols);});
diff --git a/module/execution/js/taskkanban.ui.js b/module/execution/js/taskkanban.ui.js
index 9e53ba453e..3f64df38e1 100644
--- a/module/execution/js/taskkanban.ui.js
+++ b/module/execution/js/taskkanban.ui.js
@@ -233,7 +233,7 @@ window.getItem = function(info)
info.item.title = info.item.title.replaceAll(searchValue, "" + searchValue + "");
info.item.title = {html: info.item.title};
}
- info.item.titleUrl = $.createLink(info.laneInfo.type, 'view', `id=${info.item.id}`);
+ info.item.titleUrl = info.laneInfo.type == 'story' ? $.createLink('execution', 'storyView', `id=${info.item.id}&executionID=${executionID}`) : $.createLink(info.laneInfo.type, 'view', `id=${info.item.id}`);
info.item.titleAttrs = {'data-toggle': 'modal', 'data-size' : 'lg', 'title' : info.item.title};
info.item.content = {html: content};
diff --git a/module/execution/model.php b/module/execution/model.php
index 81da973b67..7f68ea9ded 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1283,8 +1283,7 @@ class executionModel extends model
/* Order by status's content whether or not done. */
$executions = $this->dao->select("*, IF(INSTR('done,closed', status) < 2, 0, 1) AS isDone, INSTR('doing,wait,suspended,closed', status) AS sortStatus")->from(TABLE_EXECUTION)
- ->where('type')->ne('')
- ->beginIF(strpos(',lite,or,', ",{$this->config->vision},") !== false)->andWhere('vision')->eq($this->config->vision)->fi()
+ ->where('vision')->eq($this->config->vision)
->beginIF((!$this->session->multiple && $this->app->tab == 'execution') || strpos($mode, 'multiple') !== false)->andWhere('multiple')->eq('1')->fi()
->beginIF($type != 'all')->andWhere('type')->in($type)->fi()
->beginIF($type == 'all')->andWhere('type')->in('stage,sprint,kanban')->fi()
diff --git a/module/execution/tao.php b/module/execution/tao.php
index 9e3683f2d1..3e05576f54 100644
--- a/module/execution/tao.php
+++ b/module/execution/tao.php
@@ -278,7 +278,7 @@ class executionTao extends executionModel
$this->lang->execution->menu = new stdclass();
$this->lang->execution->menu->kanban = array('link' => "{$this->lang->kanban->common}|execution|kanban|executionID=%s", 'subModule' => 'task');
$this->lang->execution->menu->CFD = array('link' => "{$this->lang->execution->CFD}|execution|cfd|executionID=%s");
- $this->lang->execution->menu->build = array('link' => "{$this->lang->build->common}|execution|build|executionID=%s");
+ $this->lang->execution->menu->build = array('link' => "{$this->lang->build->common}|execution|build|executionID=%s", 'alias' => 'bug,testcase,testtask', 'subModule' => 'projectbuild,build,testcase,testtask,bug');
$this->lang->execution->menu->settings = array('link' => "{$this->lang->settings}|execution|view|executionID=%s", 'subModule' => 'personnel', 'alias' => 'edit,manageproducts,team,whitelist,addwhitelist,managemembers', 'class' => 'dropdown dropdown-hover');
$this->lang->execution->dividerMenu = '';
diff --git a/module/execution/ui/build.html.php b/module/execution/ui/build.html.php
index 1de6fa2943..daa3d34f87 100644
--- a/module/execution/ui/build.html.php
+++ b/module/execution/ui/build.html.php
@@ -44,7 +44,11 @@ jsVar('filePathTip', $lang->build->filePath);
jsVar('confirmDelete', $lang->build->confirmDelete);
$fieldList = $config->build->dtable->fieldList;
-if($execution->type == 'kanban') unset($fieldList['actions']['actionsMap']['createTest']['data-app']);
+if($execution->type == 'kanban')
+{
+ unset($fieldList['actions']['list']['createTest']['data-app']);
+ $fieldList['actions']['list']['viewBug']['url'] = $config->build->actionList['bugList']['url'];
+}
$builds = initTableData($builds, $fieldList, $this->build);
dtable
diff --git a/module/execution/ui/story.html.php b/module/execution/ui/story.html.php
index c16113de86..a250065da1 100644
--- a/module/execution/ui/story.html.php
+++ b/module/execution/ui/story.html.php
@@ -103,13 +103,15 @@ $product ? toolbar
setClass('text-primary font-bold shadow-inner bg-canvas'),
set::icon('format-list-bulleted'),
set::hint($lang->execution->list),
- set::url(inlink('story', "executionID={$execution->id}&storyType={$storyType}&orderBy={$orderBy}&type=all"))
+ set::url(inlink('story', "executionID={$execution->id}&storyType={$storyType}&orderBy={$orderBy}&type=all")),
+ setData('app', $app->tab)
),
btn
(
set::icon('kanban'),
set::hint($lang->execution->kanban),
- set::url($this->createLink('execution', 'storykanban', "executionID={$execution->id}"))
+ set::url($this->createLink('execution', 'storykanban', "executionID={$execution->id}")),
+ setData('app', $app->tab)
),
) : null,
hasPriv('story', 'report') ? item(set(array
diff --git a/module/execution/ui/storykanban.html.php b/module/execution/ui/storykanban.html.php
index e95a3244b2..e3aac8bbba 100644
--- a/module/execution/ui/storykanban.html.php
+++ b/module/execution/ui/storykanban.html.php
@@ -55,14 +55,16 @@ $product ? toolbar
(
set::icon('format-list-bulleted'),
set::hint($lang->execution->list),
- set::url(inlink('story', "executionID={$execution->id}"))
+ set::url(inlink('story', "executionID={$execution->id}")),
+ setData('app', $app->tab)
),
btn
(
setClass('text-primary font-bold shadow-inner bg-canvas'),
set::icon('kanban'),
set::hint($lang->execution->kanban),
- set::url($this->createLink('execution', 'storykanban', "executionID={$execution->id}"))
+ set::url($this->createLink('execution', 'storykanban', "executionID={$execution->id}")),
+ setData('app', $app->tab)
),
) : null,
hasPriv('story', 'export') ? item(set(array
diff --git a/module/file/control.php b/module/file/control.php
index 99b65eb97b..d831c82ec9 100755
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -184,7 +184,7 @@ class file extends control
$output .= '"';
foreach($fields as $fieldName => $fieldLabel)
{
- $output .= isset($row->$fieldName) ? str_replace(array('"', ' '), array('“', ' '), htmlspecialchars_decode(strip_tags((string)$row->$fieldName, '![]()
'))) : '';
+ $output .= isset($row->$fieldName) ? str_replace(array('"', ' '), array('“', ' '), htmlSpecialString(strip_tags((string)$row->$fieldName, '![]()
'))) : '';
$output .= '","';
}
$output .= '"' . "\n";
@@ -218,7 +218,7 @@ class file extends control
$output .= " \n";
foreach($fields as $fieldName => $fieldLabel)
{
- $fieldValue = isset($row->$fieldName) ? htmlSpecialString($row->$fieldName) : '';
+ $fieldValue = isset($row->$fieldName) ? htmlSpecialString(strip_tags((string)$row->$fieldName, '![]()
')) : '';
$output .= " <$fieldName>$fieldValue\n";
}
$output .= "
\n";
diff --git a/module/git/model.php b/module/git/model.php
index 7b508a81d1..4a3d393347 100644
--- a/module/git/model.php
+++ b/module/git/model.php
@@ -199,9 +199,9 @@ class gitModel extends model
{
$scm = strtolower($repo->SCM);
$userList = $this->loadModel($scm)->apiGetUsers((int)$repo->serviceHost);
- $acountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs((int)$repo->serviceHost, $scm, 'openID,account');
+ $accountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs((int)$repo->serviceHost, $scm, 'openID,account');
- foreach($userList as $user) $accountPairs[$user->realname] = zget($acountIDPairs, $user->id, '');
+ foreach($userList as $user) $accountPairs[$user->realname] = zget($accountIDPairs, $user->id, '');
}
/* Update code commit history. */
diff --git a/module/gitea/config/form.php b/module/gitea/config/form.php
index a483bae20a..b393ba0682 100644
--- a/module/gitea/config/form.php
+++ b/module/gitea/config/form.php
@@ -1,5 +1,4 @@
gitea->form = new stdclass();
$config->gitea->form->create = array();
$config->gitea->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitea');
@@ -7,7 +6,6 @@ $config->gitea->form->create['type'] = array('type' => 'string', 'require
$config->gitea->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->gitea->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitea->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gitea->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -15,5 +13,4 @@ $config->gitea->form->edit = array();
$config->gitea->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->edit['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->gitea->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitea->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
diff --git a/module/gitea/control.php b/module/gitea/control.php
index 3f776c306a..db855f70a3 100644
--- a/module/gitea/control.php
+++ b/module/gitea/control.php
@@ -71,7 +71,9 @@ class gitea extends control
{
if($_POST)
{
- $gitea = form::data($this->config->gitea->form->create)->get();
+ $gitea = form::data($this->config->gitea->form->create)
+ ->add('createdBy', $this->app->user->account)
+ ->get();
$result = $this->checkToken($gitea);
if(is_array($result)) return $this->send($result);
@@ -118,7 +120,9 @@ class gitea extends control
if($_POST)
{
- $gitea = form::data($this->config->gitea->form->edit)->get();
+ $gitea = form::data($this->config->gitea->form->edit)
+ ->add('editedBy', $this->app->user->account)
+ ->get();
$result = $this->checkToken($gitea);
if(is_array($result)) return $this->send($result);
diff --git a/module/gitfox/config/form.php b/module/gitfox/config/form.php
index 111cbd4f88..3509d2d3ba 100644
--- a/module/gitfox/config/form.php
+++ b/module/gitfox/config/form.php
@@ -1,5 +1,4 @@
gitfox->form = new stdclass();
$config->gitfox->form->create = array();
$config->gitfox->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitfox');
@@ -7,7 +6,6 @@ $config->gitfox->form->create['type'] = array('type' => 'string', 'requ
$config->gitfox->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->gitfox->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitfox->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gitfox->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -15,5 +13,4 @@ $config->gitfox->form->edit = array();
$config->gitfox->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->edit['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->gitfox->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitfox->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
diff --git a/module/gitfox/control.php b/module/gitfox/control.php
index f0e4efc6da..c1c17bd39c 100644
--- a/module/gitfox/control.php
+++ b/module/gitfox/control.php
@@ -22,7 +22,9 @@ class gitfox extends control
{
if($_POST)
{
- $gitfox = form::data($this->config->gitfox->form->create)->get();
+ $gitfox = form::data($this->config->gitfox->form->create)
+ ->add('createdBy', $this->app->user->account)
+ ->get();
$this->checkToken($gitfox);
$gitfoxID = $this->loadModel('pipeline')->create($gitfox);
@@ -51,7 +53,9 @@ class gitfox extends control
if($_POST)
{
- $gitfox = form::data($this->config->gitfox->form->edit)->get();
+ $gitfox = form::data($this->config->gitfox->form->edit)
+ ->add('editedBy', $this->app->user->account)
+ ->get();
$this->checkToken($gitfox, $gitfoxID);
$this->loadModel('pipeline')->update($gitfoxID, $gitfox);
$gitFox = $this->gitfox->fetchByID($gitfoxID);
diff --git a/module/gitlab/config/form.php b/module/gitlab/config/form.php
index 5a1069e123..7066b3415c 100644
--- a/module/gitlab/config/form.php
+++ b/module/gitlab/config/form.php
@@ -1,5 +1,4 @@
gitlab->form = new stdclass();
$config->gitlab->form->create = array();
$config->gitlab->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitlab');
@@ -7,7 +6,6 @@ $config->gitlab->form->create['type'] = array('type' => 'string', 'requ
$config->gitlab->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->gitlab->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitlab->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gitlab->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -15,7 +13,6 @@ $config->gitlab->form->edit = array();
$config->gitlab->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->edit['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->gitlab->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitlab->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gitlab->form->user = new stdclass();
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index c8fd774cfb..38c7470b6b 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -75,7 +75,9 @@ class gitlab extends control
{
if($_POST)
{
- $gitlab = form::data($this->config->gitlab->form->create)->get();
+ $gitlab = form::data($this->config->gitlab->form->create)
+ ->add('createdBy', $this->app->user->account)
+ ->get();
$this->checkToken($gitlab);
$gitlabID = $this->loadModel('pipeline')->create($gitlab);
@@ -123,7 +125,9 @@ class gitlab extends control
if($_POST)
{
- $gitlab = form::data($this->config->gitlab->form->edit)->get();
+ $gitlab = form::data($this->config->gitlab->form->edit)
+ ->add('editedBy', $this->app->user->account)
+ ->get();
$this->checkToken($gitlab, $gitlabID);
$this->loadModel('pipeline')->update($gitlabID, $gitlab);
$gitLab = $this->gitlab->getByID($gitlabID);
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 9ce1d89118..9f3abe8f17 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -2332,18 +2332,18 @@ class gitlabModel extends model
* @param int $projectID
* @param int $repoID
* @access public
- * @return bool
+ * @return string
*/
- public function updateCodePath(int $gitlabID, int $projectID, int $repoID): bool
+ public function updateCodePath(int $gitlabID, int $projectID, int $repoID): string
{
$project = $this->apiGetSingleProject($gitlabID, $projectID);
if(is_object($project) and !empty($project->web_url))
{
$this->dao->update(TABLE_REPO)->set('path')->eq($project->web_url)->where('id')->eq($repoID)->exec();
- return true;
+ return $project->web_url;
}
- return false;
+ return '';
}
/**
@@ -2417,6 +2417,7 @@ class gitlabModel extends model
if(!$gitlab) return array();
/* Compatible with HTTP and HTTPS domain. */
+ if(strpos($repo->codePath, '/api/v4/projects')) $repo->codePath = $this->updateCodePath((int)$repo->serviceHost, (int)$repo->serviceProject, $repo->id);
$repo->client = str_replace('https://', 'http://', $repo->client);
$repo->codePath = str_replace('https://', 'http://', $repo->codePath);
diff --git a/module/gogs/config/form.php b/module/gogs/config/form.php
index 25e8916ee0..d5fad89867 100644
--- a/module/gogs/config/form.php
+++ b/module/gogs/config/form.php
@@ -1,5 +1,4 @@
gogs->form = new stdclass();
$config->gogs->form->create = array();
$config->gogs->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gogs');
@@ -7,7 +6,6 @@ $config->gogs->form->create['type'] = array('type' => 'string', 'requir
$config->gogs->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gogs->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gogs->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->gogs->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gogs->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gogs->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -15,5 +13,4 @@ $config->gogs->form->edit = array();
$config->gogs->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gogs->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gogs->form->edit['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->gogs->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gogs->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
diff --git a/module/gogs/control.php b/module/gogs/control.php
index e06622011b..6c5e95c437 100644
--- a/module/gogs/control.php
+++ b/module/gogs/control.php
@@ -70,7 +70,9 @@ class gogs extends control
{
if($_POST)
{
- $gogs = form::data($this->config->gogs->form->create)->get();
+ $gogs = form::data($this->config->gogs->form->create)
+ ->add('createdBy', $this->app->user->account)
+ ->get();
$priv = $this->checkToken($gogs);
if(is_array($priv)) return $this->send($priv);
@@ -118,7 +120,9 @@ class gogs extends control
if($_POST)
{
- $gogs = form::data($this->config->gogs->form->edit)->get();
+ $gogs = form::data($this->config->gogs->form->edit)
+ ->add('editedBy', $this->app->user->account)
+ ->get();
$this->checkToken($gogs);
$this->loadModel('pipeline')->update($gogsID, $gogs);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index f32d2683ad..491c62d393 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -315,6 +315,7 @@ $lang->group->package->lieu = 'Lieu';
$lang->group->package->holiday = 'Holiday';
$lang->group->package->exportOffice = 'Export Office';
$lang->group->package->browseFeedback = 'Browse Feedback';
+$lang->group->package->browseLiteFeedback = $lang->group->package->browseFeedback;
$lang->group->package->manageFeedback = 'Manage Feedback';
$lang->group->package->importFeedback = 'Import Feedback';
$lang->group->package->handleFeedback = 'Handle Feedback';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index ea357ed1a1..7878db6f51 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -315,6 +315,7 @@ $lang->group->package->lieu = 'Lieu';
$lang->group->package->holiday = 'Holiday';
$lang->group->package->exportOffice = 'Export Office';
$lang->group->package->browseFeedback = 'Browse Feedback';
+$lang->group->package->browseLiteFeedback = $lang->group->package->browseFeedback;
$lang->group->package->manageFeedback = 'Manage Feedback';
$lang->group->package->importFeedback = 'Import Feedback';
$lang->group->package->handleFeedback = 'Handle Feedback';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 6678bd154e..70fcd36088 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -315,6 +315,7 @@ $lang->group->package->lieu = 'Lieu';
$lang->group->package->holiday = 'Holiday';
$lang->group->package->exportOffice = 'Export Office';
$lang->group->package->browseFeedback = 'Browse Feedback';
+$lang->group->package->browseLiteFeedback = $lang->group->package->browseFeedback;
$lang->group->package->manageFeedback = 'Manage Feedback';
$lang->group->package->importFeedback = 'Import Feedback';
$lang->group->package->handleFeedback = 'Handle Feedback';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 0532aea15e..b3a37b3f3e 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -315,6 +315,7 @@ $lang->group->package->lieu = '个人调休';
$lang->group->package->holiday = '节假日';
$lang->group->package->exportOffice = '办公导出';
$lang->group->package->browseFeedback = '浏览反馈';
+$lang->group->package->browseLiteFeedback = $lang->group->package->browseFeedback;
$lang->group->package->manageFeedback = '创建维护反馈';
$lang->group->package->importFeedback = '导入导出反馈';
$lang->group->package->handleFeedback = '处理反馈';
diff --git a/module/group/model.php b/module/group/model.php
index e1ea4f5a4d..0678ecdd45 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -867,7 +867,7 @@ class groupModel extends model
if(isset($privs[$dependPriv]) || in_array($dependPriv, $excludes)) continue;
$privs[$dependPriv] = $dependPriv;
- $dependPrivs = $this->processDepends($depends, $depends[$dependPriv], $excludes, $processedPrivs);
+ $dependPrivs = $this->processDepends($depends, zget($depends, $dependPriv, array()), $excludes, $processedPrivs);
foreach($dependPrivs as $depend)
{
diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php
index fe4929082c..4c090e8c80 100644
--- a/module/group/packagemanager.php
+++ b/module/group/packagemanager.php
@@ -493,6 +493,20 @@ $config->group->subset->artifactrepo = new stdclass();
$config->group->subset->artifactrepo->order = 2760;
$config->group->subset->artifactrepo->nav = 'devops';
+$config->group->subset->market = new stdclass();
+$config->group->subset->market->nav = 'market';
+
+$config->group->subset->marketreport = new stdclass();
+$config->group->subset->marketreport->nav = 'market';
+
+$config->group->subset->marketresearch = new stdclass();
+$config->group->subset->marketresearch->nav = 'market';
+
+$config->group->subset->researchstage = new stdclass();
+$config->group->subset->researchstage->nav = 'market';
+
+$config->group->subset->researchtask = new stdclass();
+$config->group->subset->researchtask->nav = 'market';
$config->group->subset->other = new stdclass();
$config->group->subset->other->order = 100000;
@@ -1499,6 +1513,13 @@ $config->group->package->browseFeedback->privs = array();
$config->group->package->browseFeedback->privs['feedback-adminView'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 25, 'depend' => array('feedback-admin'), 'recommend' => array('feedback-create', 'feedback-edit'));
$config->group->package->browseFeedback->privs['feedback-admin'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 30, 'depend' => array(), 'recommend' => array('feedback-adminView'));
+$config->group->package->browseLiteFeedback = new stdclass();
+$config->group->package->browseLiteFeedback->order = 5;
+$config->group->package->browseLiteFeedback->subset = 'feedback';
+$config->group->package->browseLiteFeedback->privs = array();
+$config->group->package->browseLiteFeedback->privs['feedback-view'] = array('edition' => 'biz,max,ipd', 'vision' => 'lite', 'order' => 25, 'depend' => array('feedback-browse'), 'recommend' => array('feedback-create', 'feedback-edit'));
+$config->group->package->browseLiteFeedback->privs['feedback-browse'] = array('edition' => 'biz,max,ipd', 'vision' => 'lite', 'order' => 30, 'depend' => array(), 'recommend' => array('feedback-view'));
+
$config->group->package->manageFeedback = new stdclass();
$config->group->package->manageFeedback->order = 10;
$config->group->package->manageFeedback->subset = 'feedback';
@@ -1526,18 +1547,18 @@ $config->group->package->handleFeedback = new stdclass();
$config->group->package->handleFeedback->order = 20;
$config->group->package->handleFeedback->subset = 'feedback';
$config->group->package->handleFeedback->privs = array();
-$config->group->package->handleFeedback->privs['feedback-editOthers'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('feedback-admin'), 'recommend' => array('feedback-edit'));
+$config->group->package->handleFeedback->privs['feedback-editOthers'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 10, 'depend' => array('feedback-admin'), 'recommend' => array('feedback-edit'));
$config->group->package->handleFeedback->privs['feedback-toTask'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('feedback-admin', 'task-create'), 'recommend' => array('feedback-reply', 'feedback-review', 'feedback-toBug', 'feedback-toStory', 'feedback-toTicket', 'feedback-toTodo', 'feedback-toUserStory'));
$config->group->package->handleFeedback->privs['feedback-toTodo'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 7, 'depend' => array('feedback-admin', 'todo-create'), 'recommend' => array('feedback-reply', 'feedback-review', 'feedback-toBug', 'feedback-toStory', 'feedback-toTask', 'feedback-toTicket', 'feedback-toUserStory'));
$config->group->package->handleFeedback->privs['feedback-toBug'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('feedback-admin', 'bug-create'), 'recommend' => array('feedback-reply', 'feedback-review', 'feedback-toStory', 'feedback-toTask', 'feedback-toTicket', 'feedback-toTodo', 'feedback-toUserStory'));
$config->group->package->handleFeedback->privs['feedback-toStory'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('feedback-admin', 'story-create'), 'recommend' => array('feedback-reply', 'feedback-review', 'feedback-toBug', 'feedback-toTask', 'feedback-toTicket', 'feedback-toTodo', 'feedback-toUserStory'));
$config->group->package->handleFeedback->privs['feedback-toTicket'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('feedback-admin', 'ticket-create'), 'recommend' => array('feedback-reply', 'feedback-review', 'feedback-toBug', 'feedback-toStory', 'feedback-toTask', 'feedback-toTodo', 'feedback-toUserStory'));
$config->group->package->handleFeedback->privs['feedback-toUserStory'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 4, 'depend' => array('feedback-admin', 'requirement-create'), 'recommend' => array('feedback-reply', 'feedback-review', 'feedback-toBug', 'feedback-toStory', 'feedback-toTask', 'feedback-toTicket', 'feedback-toTodo'));
-$config->group->package->handleFeedback->privs['feedback-toDemand'] = array('edition' => 'biz,max,ipd', 'vision' => 'or', 'order' => 4, 'depend' => array('feedback-admin', 'demand-create'), 'recommend' => array('feedback-reply', 'feedback-review', 'feedback-toBug', 'feedback-toStory', 'feedback-toTask', 'feedback-toTicket', 'feedback-toTodo'));
+$config->group->package->handleFeedback->privs['feedback-toDemand'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 4, 'depend' => array('feedback-admin', 'demand-create'), 'recommend' => array('feedback-reply', 'feedback-review', 'feedback-toBug', 'feedback-toStory', 'feedback-toTask', 'feedback-toTicket', 'feedback-toTodo'));
$config->group->package->handleFeedback->privs['feedback-review'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 0, 'depend' => array('feedback-admin'), 'recommend' => array('feedback-batchReview', 'feedback-reply', 'feedback-toBug', 'feedback-toStory', 'feedback-toTask', 'feedback-toTicket', 'feedback-toTodo', 'feedback-toUserStory'));
$config->group->package->handleFeedback->privs['feedback-reply'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 2, 'depend' => array('feedback-admin'), 'recommend' => array('feedback-review', 'feedback-toBug', 'feedback-toStory', 'feedback-toTask', 'feedback-toTicket', 'feedback-toTodo', 'feedback-toUserStory'));
$config->group->package->handleFeedback->privs['feedback-batchReview'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 1, 'depend' => array('feedback-admin'), 'recommend' => array('feedback-review'));
-$config->group->package->handleFeedback->privs['feedback-syncProduct'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('feedback-admin'), 'recommend' => array());
+$config->group->package->handleFeedback->privs['feedback-syncProduct'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or', 'order' => 9, 'depend' => array('feedback-admin'), 'recommend' => array());
$config->group->package->faq = new stdclass();
$config->group->package->faq->order = 5;
@@ -1587,7 +1608,7 @@ $config->group->package->deleteFeedback = new stdclass();
$config->group->package->deleteFeedback->order = 25;
$config->group->package->deleteFeedback->subset = 'feedback';
$config->group->package->deleteFeedback->privs = array();
-$config->group->package->deleteFeedback->privs['feedback-delete'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 95, 'depend' => array('feedback-admin'), 'recommend' => array('feedback-create', 'feedback-edit'));
+$config->group->package->deleteFeedback->privs['feedback-delete'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,or,lite', 'order' => 95, 'depend' => array('feedback-admin'), 'recommend' => array('feedback-create', 'feedback-edit'));
$config->group->package->deleteTIcket = new stdclass();
$config->group->package->deleteTIcket->order = 25;
@@ -1817,6 +1838,8 @@ $config->group->package->manageCase->privs['testcase-confirmLibcaseChange'] =
$config->group->package->manageCase->privs['testcase-ignoreLibcaseChange'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('testcase-view'), 'recommend' => array('testcase-confirmChange', 'testcase-confirmLibcaseChange', 'testcase-confirmStoryChange', 'testcase-create', 'testcase-edit'));
$config->group->package->manageCase->privs['testcase-submit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('testcase-view'), 'recommend' => array('testcase-confirmChange', 'testcase-confirmLibcaseChange', 'testcase-confirmStoryChange', 'testcase-create', 'testcase-edit', 'testcase-ignoreLibcaseChange', 'testcase-linkBugs', 'testcase-linkCases'));
$config->group->package->manageCase->privs['testcase-updateOrder'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 30, 'depend' => array(), 'recommend' => array());
+$config->group->package->manageCase->privs['testcase-confirmdemandretract'] = array('edition' => 'ipd', 'vision' => 'rnd,or', 'order' => 30, 'depend' => array(), 'recommend' => array());
+$config->group->package->manageCase->privs['testcase-confirmdemandunlink'] = array('edition' => 'ipd', 'vision' => 'rnd,or', 'order' => 30, 'depend' => array(), 'recommend' => array());
$config->group->package->importCase = new stdclass();
$config->group->package->importCase->order = 25;
@@ -2007,7 +2030,7 @@ $config->group->package->companyTeam->privs['user-todo'] = array('edit
$config->group->package->companyTeam->privs['user-task'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 5, 'depend' => array('my-team', 'user-todo'), 'recommend' => array('user-bug', 'user-dynamic', 'user-effort', 'user-execution', 'user-issue', 'user-profile', 'user-risk', 'user-story', 'user-testCase', 'user-testTask'));
$config->group->package->companyTeam->privs['user-bug'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array('my-team', 'user-todo'), 'recommend' => array('user-dynamic', 'user-effort', 'user-execution', 'user-issue', 'user-profile', 'user-risk', 'user-story', 'user-task', 'user-testCase', 'user-testTask'));
$config->group->package->companyTeam->privs['user-dynamic'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 13, 'depend' => array('my-team', 'user-todo'), 'recommend' => array('user-bug', 'user-effort', 'user-execution', 'user-issue', 'user-profile', 'user-risk', 'user-story', 'user-task', 'user-testCase', 'user-testTask'));
-$config->group->package->companyTeam->privs['user-profile'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 14, 'depend' => array('my-team', 'user-todo'), 'recommend' => array('user-bug', 'user-dynamic', 'user-effort', 'user-execution', 'user-issue', 'user-risk', 'user-story', 'user-task', 'user-testCase', 'user-testTask'));
+$config->group->package->companyTeam->privs['user-profile'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 14, 'depend' => array('my-team', 'user-todo'), 'recommend' => array('user-bug', 'user-dynamic', 'user-effort', 'user-execution', 'user-issue', 'user-risk', 'user-story', 'user-task', 'user-testCase', 'user-testTask'));
$config->group->package->companyTeam->privs['user-story'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 6, 'depend' => array('my-team', 'user-todo'), 'recommend' => array('user-bug', 'user-dynamic', 'user-effort', 'user-execution', 'user-issue', 'user-profile', 'user-risk', 'user-task', 'user-testCase', 'user-testTask'));
$config->group->package->companyTeam->privs['user-testTask'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('my-team', 'user-todo'), 'recommend' => array('user-bug', 'user-dynamic', 'user-effort', 'user-execution', 'user-issue', 'user-profile', 'user-risk', 'user-story', 'user-task', 'user-testCase'));
$config->group->package->companyTeam->privs['user-testCase'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('my-team', 'user-todo'), 'recommend' => array('user-bug', 'user-dynamic', 'user-effort', 'user-execution', 'user-issue', 'user-profile', 'user-risk', 'user-story', 'user-task', 'user-testTask'));
@@ -3597,6 +3620,7 @@ $config->group->package->browseDemandPool->order = 5;
$config->group->package->browseDemandPool->subset = 'demandpool';
$config->group->package->browseDemandPool->privs = array();
$config->group->package->browseDemandPool->privs['demandpool-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array(), 'recommend' => array('demandpool-edit', 'demandpool-view'));
+$config->group->package->browseDemandPool->privs['demandpool-track'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array(), 'recommend' => array());
$config->group->package->browseDemandPool->privs['demandpool-view'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 40, 'depend' => array('demandpool-browse'), 'recommend' => array('demandpool-activate', 'demandpool-close', 'demandpool-delete', 'demandpool-edit'));
$config->group->package->browseCharter = new stdclass();
@@ -3653,6 +3677,7 @@ $config->group->package->manageDemand->privs['demand-manageTree'] = array('edit
$config->group->package->manageDemand->privs['demand-close'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 180, 'depend' => array('demand-browse', 'demand-view'), 'recommend' => array('demand-activate', 'demand-assignTo', 'demand-batchCreate', 'demand-create', 'demand-edit'));
$config->group->package->manageDemand->privs['demand-activate'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 190, 'depend' => array('demand-browse', 'demand-view'), 'recommend' => array('demand-assignTo', 'demand-batchCreate', 'demand-close', 'demand-create', 'demand-edit'));
$config->group->package->manageDemand->privs['demand-distribute'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 200, 'depend' => array('demand-browse', 'demand-view'), 'recommend' => array('demand-assignTo', 'demand-batchCreate', 'demand-create', 'demand-edit'));
+$config->group->package->manageDemand->privs['demand-retract'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 210, 'depend' => array('demandpool-browse', 'demand-browse', 'demand-view'), 'recommend' => array('demand-distribute'));
$config->group->package->reviewDemand = new stdclass();
$config->group->package->reviewDemand->order = 5;
@@ -3968,3 +3993,122 @@ $config->group->package->trainPracticeLib->privs['traincourse-practice'] =
$config->group->package->trainPracticeLib->privs['traincourse-practiceBrowse'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('traincourse-practice'), 'recommend' => array('traincourse-practiceView'));
$config->group->package->trainPracticeLib->privs['traincourse-practiceView'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('traincourse-practice', 'traincourse-practiceBrowse'), 'recommend' => array());
$config->group->package->trainPracticeLib->privs['traincourse-updatePractice'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('traincourse-practice', 'traincourse-practiceBrowse'), 'recommend' => array('traincourse-practiceView'));
+
+$config->group->package->browseMarket = new stdclass();
+$config->group->package->browseMarket->subset = 'market';
+$config->group->package->browseMarket->privs = array();
+$config->group->package->browseMarket->privs['market-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(), 'recommend' => array('market-view'));
+$config->group->package->browseMarket->privs['market-view'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('market-browse'), 'recommend' => array());
+
+$config->group->package->manageMarket = new stdclass();
+$config->group->package->manageMarket->subset = 'market';
+$config->group->package->manageMarket->privs = array();
+$config->group->package->manageMarket->privs['market-create'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('market-browse'), 'recommend' => array('market-view'));
+$config->group->package->manageMarket->privs['market-edit'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('market-browse', 'market-view'), 'recommend' => array());
+
+$config->group->package->deleteMarket = new stdclass();
+$config->group->package->deleteMarket->subset = 'market';
+$config->group->package->deleteMarket->privs = array();
+$config->group->package->deleteMarket->privs['market-delete'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('market-browse', 'market-view'), 'recommend' => array('market-create', 'market-edit'));
+
+$config->group->package->deleteMarket = new stdclass();
+$config->group->package->deleteMarket->subset = 'market';
+$config->group->package->deleteMarket->privs = array();
+$config->group->package->deleteMarket->privs['market-delete'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('market-browse', 'market-view'), 'recommend' => array('market-create', 'market-edit'));
+
+$config->group->package->browseReport = new stdclass();
+$config->group->package->browseReport->subset = 'marketreport';
+$config->group->package->browseReport->privs = array();
+$config->group->package->browseReport->privs['marketreport-all'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(), 'recommend' => array('market-view'));
+$config->group->package->browseReport->privs['marketreport-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array(), 'recommend' => array('market-view'));
+$config->group->package->browseReport->privs['marketreport-view'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketreport-browse'), 'recommend' => array());
+
+$config->group->package->manageReport = new stdclass();
+$config->group->package->manageReport->subset = 'marketreport';
+$config->group->package->manageReport->privs = array();
+$config->group->package->manageReport->privs['marketreport-create'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketreport-all', 'marketreport-browse', 'marketreport-publish'), 'recommend' => array('marketreport-view'));
+$config->group->package->manageReport->privs['marketreport-edit'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketreport-all', 'marketreport-browse', 'marketreport-publish'), 'recommend' => array('marketreport-view'));
+$config->group->package->manageReport->privs['marketreport-publish'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketreport-all', 'marketreport-browse'), 'recommend' => array('marketreport-view'));
+
+$config->group->package->deleteReport = new stdclass();
+$config->group->package->deleteReport->subset = 'marketreport';
+$config->group->package->deleteReport->privs = array();
+$config->group->package->deleteReport->privs['marketreport-delete'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketreport-all', 'marketreport-browse', 'marketreport-publish'), 'recommend' => array('marketreport-create', 'marketreport-edit'));
+
+$config->group->package->browseResearch = new stdclass();
+$config->group->package->browseResearch->subset = 'marketresearch';
+$config->group->package->browseResearch->privs = array();
+$config->group->package->browseResearch->privs['marketresearch-all'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array(), 'recommend' => array('marketresearch-view'));
+$config->group->package->browseResearch->privs['marketresearch-browse'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array(), 'recommend' => array('marketresearch-view'));
+$config->group->package->browseResearch->privs['marketresearch-view'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array(), 'recommend' => array('marketresearch-all', 'marketresearch-browse'));
+
+$config->group->package->manageResearch = new stdclass();
+$config->group->package->manageResearch->subset = 'marketresearch';
+$config->group->package->manageResearch->privs = array();
+$config->group->package->manageResearch->privs['marketresearch-create'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse'), 'recommend' => array());
+$config->group->package->manageResearch->privs['marketresearch-edit'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array());
+$config->group->package->manageResearch->privs['marketresearch-activate'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array());
+$config->group->package->manageResearch->privs['marketresearch-start'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array());
+$config->group->package->manageResearch->privs['marketresearch-close'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array());
+
+$config->group->package->researchTeam = new stdclass();
+$config->group->package->researchTeam->subset = 'marketresearch';
+$config->group->package->researchTeam->privs = array();
+$config->group->package->researchTeam->privs['marketresearch-manageMembers'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array());
+$config->group->package->researchTeam->privs['marketresearch-unlinkMember'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view', 'marketresearch-manageMembers'), 'recommend' => array());
+$config->group->package->researchTeam->privs['marketresearch-team'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-all', 'marketresearch-browse'), 'recommend' => array('marketresearch-view'));
+
+$config->group->package->marketResearchReport = new stdclass();
+$config->group->package->marketResearchReport->subset = 'marketresearch';
+$config->group->package->marketResearchReport->privs = array();
+$config->group->package->marketResearchReport->privs['marketresearch-reports'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketreport-browse', 'marketreport-create', 'marketreport-all', 'marketresearch-browse', 'marketreport-view'), 'recommend' => array());
+
+$config->group->package->deleteResearch = new stdclass();
+$config->group->package->deleteResearch->subset = 'marketresearch';
+$config->group->package->deleteResearch->privs = array();
+$config->group->package->deleteResearch->privs['marketresearch-delete'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse', 'marketresearch-view'), 'recommend' => array('marketresearch-create', 'marketresearch-edit'));
+
+$config->group->package->browseResearchStage = new stdclass();
+$config->group->package->browseResearchStage->subset = 'researchstage';
+$config->group->package->browseResearchStage->privs = array();
+$config->group->package->browseResearchStage->privs['marketresearch-stage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse'), 'recommend' => array('marketresearch-view'));
+
+$config->group->package->manageResearchStage = new stdclass();
+$config->group->package->manageResearchStage->subset = 'researchstage';
+$config->group->package->manageResearchStage->privs = array();
+$config->group->package->manageResearchStage->privs['marketresearch-createStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array('marketresearch-view'));
+$config->group->package->manageResearchStage->privs['marketresearch-editStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array());
+$config->group->package->manageResearchStage->privs['marketresearch-batchStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array());
+$config->group->package->manageResearchStage->privs['marketresearch-startStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array());
+$config->group->package->manageResearchStage->privs['marketresearch-closeStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array());
+$config->group->package->manageResearchStage->privs['marketresearch-activateStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 30, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array());
+
+$config->group->package->deleteResearchStage = new stdclass();
+$config->group->package->deleteResearchStage->subset = 'researchstage';
+$config->group->package->deleteResearchStage->privs = array();
+$config->group->package->deleteResearchStage->privs['marketresearch-deleteStage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array());
+
+$config->group->package->browseResearchTask = new stdclass();
+$config->group->package->browseResearchTask->subset = 'researchtask';
+$config->group->package->browseResearchTask->privs = array();
+$config->group->package->browseResearchTask->privs['marketresearch-stage'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-all', 'marketresearch-browse'), 'recommend' => array('marketresearch-viewTask'));
+$config->group->package->browseResearchTask->privs['marketresearch-viewTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse'), 'recommend' => array());
+
+$config->group->package->manageResearchTask = new stdclass();
+$config->group->package->manageResearchTask->subset = 'researchtask';
+$config->group->package->manageResearchTask->privs = array();
+$config->group->package->manageResearchTask->privs['marketresearch-createTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-activateTask', 'marketresearch-closeTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
+$config->group->package->manageResearchTask->privs['marketresearch-batchCreateTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-activateTask', 'marketresearch-closeTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
+$config->group->package->manageResearchTask->privs['marketresearch-editTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-activateTask', 'marketresearch-closeTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
+$config->group->package->manageResearchTask->privs['marketresearch-taskAssignTo'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-activateTask', 'marketresearch-closeTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
+$config->group->package->manageResearchTask->privs['marketresearch-startTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-finishTask', 'marketresearch-activateTask', 'marketresearch-closeTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
+$config->group->package->manageResearchTask->privs['marketresearch-recordTaskEstimate'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 30, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-activateTask', 'marketresearch-closeTask', 'marketresearch-cancelTask'));
+$config->group->package->manageResearchTask->privs['marketresearch-finishTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 35, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-activateTask', 'marketresearch-closeTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
+$config->group->package->manageResearchTask->privs['marketresearch-activateTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 40, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-closeTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
+$config->group->package->manageResearchTask->privs['marketresearch-closeTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 45, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-activateTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
+$config->group->package->manageResearchTask->privs['marketresearch-cancelTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 50, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-closeTask', 'marketresearch-activateTask', 'marketresearch-recordTaskEstimate'));
+
+$config->group->package->deleteResearchTask = new stdclass();
+$config->group->package->deleteResearchTask->subset = 'researchtask';
+$config->group->package->deleteResearchTask->privs = array();
+$config->group->package->deleteResearchTask->privs['marketresearch-deleteTask'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('marketresearch-stage', 'marketresearch-all', 'marketresearch-browse', 'marketresearch-viewTask'), 'recommend' => array('marketresearch-createTask', 'marketresearch-batchCreateTask', 'marketresearch-taskAssignTo', 'marketresearch-editTask', 'marketresearch-startTask', 'marketresearch-finishTask', 'marketresearch-closeTask', 'marketresearch-activateTask', 'marketresearch-cancelTask', 'marketresearch-recordTaskEstimate'));
diff --git a/module/index/js/index.ui.js b/module/index/js/index.ui.js
index b067671e37..bf7664d88e 100644
--- a/module/index/js/index.ui.js
+++ b/module/index/js/index.ui.js
@@ -667,8 +667,8 @@ function initAppsMenu(items)
icon: 'icon-search',
methodName: 'index',
moduleName: 'search',
- text: lang.search,
- title: ' ' + lang.search,
+ text: langData.search,
+ title: ' ' + langData.search,
url: '/index.php?m=search&f=index',
vars: ''
};
@@ -766,11 +766,11 @@ $(document).on('click', '.open-in-app,.show-in-app', function(e)
if(!code) return;
const app = apps.openedMap[code];
- const items = [{text: lang.open, disabled: app && getLastAppCode() === code, onClick: function(){showApp(code)}}];
+ const items = [{text: langData.open, disabled: app && getLastAppCode() === code, onClick: function(){showApp(code)}}];
if(app)
{
- items.push({text: lang.reload, onClick: function(){reloadApp(code)}});
- if(code !== 'my') items.push({text: lang.close, onClick: function(){closeApp(code)}});
+ items.push({text: langData.reload, onClick: function(){reloadApp(code)}});
+ if(code !== 'my') items.push({text: langData.close, onClick: function(){closeApp(code)}});
}
zui.ContextMenu.show({hideOthers: true, element: $btn[0], placement: $btn.closest('#appTabs').length ? 'top-start' : 'right-start', items: items, event: event, onClickItem: function(info){info.event.preventDefault();}});
diff --git a/module/index/ui/index.html.php b/module/index/ui/index.html.php
index f579b421e3..15ecc7c0a9 100644
--- a/module/index/ui/index.html.php
+++ b/module/index/ui/index.html.php
@@ -28,7 +28,7 @@ jsVar('appsItems', $appsItems);
jsVar('defaultOpen', !empty($open) ? $open : '');
jsVar('manualText', $lang->manual);
jsVar('manualUrl', ((!empty($config->isINT)) ? $config->manualUrl['int'] : $config->manualUrl['home']) . '&theme=' . $_COOKIE['theme']);
-jsVar('lang', array_merge(array('search' => $lang->index->search, 'searchAB' => $lang->searchAB), (array)$lang->index->dock));
+jsVar('langData', array_merge(array('search' => $lang->index->search, 'searchAB' => $lang->searchAB), (array)$lang->index->dock));
jsVar('browserMessage', $browserMessage);
jsVar('pollTime', (!empty($config->message->browser->turnon) && isset($config->message->browser->pollTime)) ? $config->message->browser->pollTime : 600);
jsVar('turnon', empty($config->message->browser->turnon) ? 0 : 1);
diff --git a/module/install/css/showtableprogress.ui.css b/module/install/css/showtableprogress.ui.css
deleted file mode 100644
index dbf15d50bf..0000000000
--- a/module/install/css/showtableprogress.ui.css
+++ /dev/null
@@ -1 +0,0 @@
-.progress{overflow:hidden; height:400px; display: block; white-space: normal;}
diff --git a/module/install/css/step1.ui.css b/module/install/css/step1.ui.css
deleted file mode 100644
index 71fe0d6df6..0000000000
--- a/module/install/css/step1.ui.css
+++ /dev/null
@@ -1 +0,0 @@
-.panel .panel-heading {justify-content: flex-start; gap: 0.125rem;}
diff --git a/module/install/css/step2.ui.css b/module/install/css/step2.ui.css
deleted file mode 100644
index 97151af510..0000000000
--- a/module/install/css/step2.ui.css
+++ /dev/null
@@ -1 +0,0 @@
-.table.bordered > * > tr > th:first-child {text-align: right;}
diff --git a/module/install/css/step4.ui.css b/module/install/css/step4.ui.css
index 33285e5ae3..6e73cf040b 100644
--- a/module/install/css/step4.ui.css
+++ b/module/install/css/step4.ui.css
@@ -1,6 +1 @@
-.panel {width: 1000px; margin: auto; padding-bottom: 32px;}
-.panel .panel-heading {justify-content: flex-start; padding: 24px 16px; gap: 0.125rem;}
-.panel .panel-body {padding: 0px 16px;}
-.panel .panel-body .table.bordered > thead {background-color: var(--color-gray-100); color: var(--color-gray-900);}
-.table.bordered > * > tr > td {text-align: center;}
-.table.bordered > * > tr > td:first-child {text-align: left;}
+.panel .panel-body {padding-top: 0px;}
diff --git a/module/install/css/step5.ui.css b/module/install/css/step5.ui.css
deleted file mode 100644
index 6437ac8538..0000000000
--- a/module/install/css/step5.ui.css
+++ /dev/null
@@ -1,2 +0,0 @@
-#mainContent .panel {padding: 1rem; margin-top: 10%;}
-#mainContent .panel-heading {width: 24rem; margin: auto; padding: 0.75rem;}
diff --git a/module/install/ui/app.html.php b/module/install/ui/app.html.php
index 12ceca941f..b6ce20c8b8 100644
--- a/module/install/ui/app.html.php
+++ b/module/install/ui/app.html.php
@@ -28,10 +28,12 @@ foreach($components->category as $item)
jsVar('category', $category);
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
formPanel
(
set::formID('solutionForm'),
diff --git a/module/install/ui/index.html.php b/module/install/ui/index.html.php
index 84478fb43c..b30f1236c5 100644
--- a/module/install/ui/index.html.php
+++ b/module/install/ui/index.html.php
@@ -17,11 +17,12 @@ foreach($app->config->langs as $key => $value) $langItems[] = array('text' => $v
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
- setClass('px-1 mt-2'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('p-8'),
diff --git a/module/install/ui/license.html.php b/module/install/ui/license.html.php
index a1210ad669..13baa73a55 100644
--- a/module/install/ui/license.html.php
+++ b/module/install/ui/license.html.php
@@ -16,11 +16,12 @@ jsVar('nextLink', $config->inQuickon ? inlink('step5') : inlink('step1'));
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
- setClass('px-1 mt-2'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('p-8'),
diff --git a/module/install/ui/progress.html.php b/module/install/ui/progress.html.php
index 862445a0a9..865b59b68d 100644
--- a/module/install/ui/progress.html.php
+++ b/module/install/ui/progress.html.php
@@ -74,10 +74,12 @@ if(!helper::isAjaxRequest('modal'))
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
h::importCss($app->getWebRoot() . 'js/xterm/xterm.css'),
set('data-loading', $lang->solution->notices->uninstallingSolution),
formPanel
diff --git a/module/install/ui/showtableprogress.html.php b/module/install/ui/showtableprogress.html.php
index d037a68560..21279e9a76 100644
--- a/module/install/ui/showtableprogress.html.php
+++ b/module/install/ui/showtableprogress.html.php
@@ -15,17 +15,19 @@ set::zui(true);
jsVar('dbFinish', $lang->install->dbFinish);
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('py-2'),
set::title($lang->install->dbProgress),
form
(
- h::pre(setID('progress'), setClass('progress')),
+ h::pre(setID('progress'), setClass('progress block overflow-hidden h-96')),
set::actions(array(array('disabled' => true, 'text' => $lang->install->next, 'class' => 'primary next')))
)
)
diff --git a/module/install/ui/step1.html.php b/module/install/ui/step1.html.php
index 39ed11150c..3d5389fb56 100644
--- a/module/install/ui/step1.html.php
+++ b/module/install/ui/step1.html.php
@@ -63,10 +63,12 @@ foreach($dirItems as $dirItem)
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('py-2'),
diff --git a/module/install/ui/step2.html.php b/module/install/ui/step2.html.php
index 26326950f5..58025f047f 100644
--- a/module/install/ui/step2.html.php
+++ b/module/install/ui/step2.html.php
@@ -16,10 +16,12 @@ set::zui(true);
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('py-2'),
@@ -33,17 +35,13 @@ div
setClass('table bordered'),
h::tr
(
- h::th
- (
- width('1/5'),
- $lang->install->key
- ),
+ h::th(setClass('text-right w-1/5'), $lang->install->key),
h::th($lang->install->value),
h::th()
),
h::tr
(
- h::th($lang->install->timezone),
+ h::th(setClass('text-right'), $lang->install->timezone),
h::td
(
picker
@@ -58,7 +56,7 @@ div
),
h::tr
(
- h::th($lang->install->defaultLang),
+ h::th(setClass('text-right'), $lang->install->defaultLang),
h::td
(
picker
@@ -74,7 +72,7 @@ div
$config->edition != 'open' ? h::tr
(
$config->inQuickon ? setClass('hidden') : null,
- h::th($lang->install->dbDriver),
+ h::th(setClass('text-right'), $lang->install->dbDriver),
h::td
(
picker
@@ -95,7 +93,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
- h::th($lang->install->dbHost),
+ h::th(setClass('text-right'), $lang->install->dbHost),
h::td
(
formGroup
@@ -112,7 +110,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
- h::th($lang->install->dbPort),
+ h::th(setClass('text-right'), $lang->install->dbPort),
h::td
(
formGroup
@@ -128,7 +126,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
- h::th($lang->install->dbEncoding),
+ h::th(setClass('text-right'), $lang->install->dbEncoding),
h::td
(
formGroup
@@ -145,7 +143,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
- h::th($lang->install->dbUser),
+ h::th(setClass('text-right'), $lang->install->dbUser),
h::td
(
formGroup
@@ -162,7 +160,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
- h::th($lang->install->dbPassword),
+ h::th(setClass('text-right'), $lang->install->dbPassword),
h::td
(
formGroup
@@ -178,7 +176,7 @@ div
),
h::tr
(
- h::th($lang->install->dbName),
+ h::th(setClass('text-right'), $lang->install->dbName),
h::td
(
formGroup
@@ -194,7 +192,7 @@ div
),
h::tr
(
- h::th($lang->install->dbPrefix),
+ h::th(setClass('text-right'), $lang->install->dbPrefix),
h::td
(
formGroup
diff --git a/module/install/ui/step3.html.php b/module/install/ui/step3.html.php
index bf1b90d394..ada579747e 100644
--- a/module/install/ui/step3.html.php
+++ b/module/install/ui/step3.html.php
@@ -45,11 +45,12 @@ if(is_writable($configRoot) && @file_put_contents($myConfigFile, $configContent)
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
- setClass('px-1 mt-2'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
set::title($lang->install->saveConfig),
diff --git a/module/install/ui/step4.html.php b/module/install/ui/step4.html.php
index 0a31dbe200..28853ff02b 100644
--- a/module/install/ui/step4.html.php
+++ b/module/install/ui/step4.html.php
@@ -25,7 +25,11 @@ foreach($disabledFeatures as $feature)
if(is_array($feature) && empty($disabledScrumFeatures)) continue;
$trs[] = h::tr
(
- h::td(is_array($feature) && !empty($disabledScrumFeatures) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature]),
+ h::td
+ (
+ setClass('text-left'),
+ is_array($feature) && !empty($disabledScrumFeatures) ? sprintf($lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $lang->custom->features[$feature]
+ ),
h::td
(
icon
@@ -51,7 +55,11 @@ foreach($config->custom->allFeatures as $feature)
$trs[] = h::tr
(
- h::td(($feature == 'scrumDetail' && !empty($enabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $enabledScrumFeatures)) : $this->lang->custom->features[$feature]),
+ h::td
+ (
+ setClass('text-left'),
+ ($feature == 'scrumDetail' && !empty($enabledScrumFeatures)) ? sprintf($lang->custom->scrum->common, implode($lang->comma, $enabledScrumFeatures)) : $lang->custom->features[$feature]
+ ),
h::td
(
icon
@@ -73,18 +81,21 @@ foreach($config->custom->allFeatures as $feature)
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
formPanel
(
- setClass('bg-canvas'),
+ setClass('bg-canvas m-auto pb-8'),
set::title($lang->install->selectMode),
set::titleClass('text-xl'),
set::actions(array()),
to::heading
(
+ setClass('justify-start gap-1'),
span
(
setClass('text-gray'),
@@ -93,12 +104,12 @@ div
setClass('text-warning px-1'),
'help'
),
- $this->lang->upgrade->remarkDesc
+ $lang->upgrade->remarkDesc
)
),
h::table
(
- setClass('table bordered'),
+ setClass('table bordered text-center'),
h::thead
(
h::tr
@@ -111,12 +122,12 @@ div
h::td
(
width('1/3'),
- $this->lang->custom->modeList['light']
+ $lang->custom->modeList['light']
),
h::td
(
width('1/3'),
- $this->lang->custom->modeList['ALM']
+ $lang->custom->modeList['ALM']
)
)
),
@@ -124,9 +135,9 @@ div
(
h::tr
(
- h::td($lang->custom->usage),
- h::td($this->lang->custom->modeIntroductionList['light']),
- h::td($this->lang->custom->modeIntroductionList['ALM']),
+ h::td(setClass('text-left'), $lang->custom->usage),
+ h::td($lang->custom->modeIntroductionList['light']),
+ h::td($lang->custom->modeIntroductionList['ALM']),
),
$trs,
h::tr
diff --git a/module/install/ui/step5.html.php b/module/install/ui/step5.html.php
index 0d63777e04..3ca46e6300 100644
--- a/module/install/ui/step5.html.php
+++ b/module/install/ui/step5.html.php
@@ -21,10 +21,12 @@ if(isset($error))
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
isset($success) ? panel
(
set::title($lang->install->success),
@@ -37,6 +39,7 @@ div
(
setClass('bg-canvas m-auto mw-auto'),
set::title($lang->install->getPriv),
+ set::headingClass('w-96 m-auto'),
set::formClass('w-96 m-auto'),
set::submitBtnText(!empty($config->inQuickon) ? $lang->install->next : $lang->save),
formRow
diff --git a/module/install/ui/step6.html.php b/module/install/ui/step6.html.php
index fb2576e7d6..8f403d8f1e 100644
--- a/module/install/ui/step6.html.php
+++ b/module/install/ui/step6.html.php
@@ -16,10 +16,12 @@ $joinZentao = ($installFileDeleted ? $lang->install->successLabel : $lang->insta
div
(
- set::id('main'),
+ setID('main'),
+ setClass('flex justify-center'),
div
(
- set::id('mainContent'),
+ setID('mainContent'),
+ setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('p-2'),
diff --git a/module/instance/config/form.php b/module/instance/config/form.php
index c25da1481f..041a8abda8 100644
--- a/module/instance/config/form.php
+++ b/module/instance/config/form.php
@@ -1,5 +1,4 @@
instance->form = new stdclass();
$config->instance->form->create = array();
$config->instance->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => '');
@@ -7,7 +6,6 @@ $config->instance->form->create['name'] = array('type' => 'string', 'requ
$config->instance->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->create['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->create['password'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->instance->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => isset($app->user->account) ? $app->user->account : '');
$config->instance->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->instance->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -16,7 +14,6 @@ $config->instance->form->edit['name'] = array('type' => 'string', 'require
$config->instance->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->edit['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->edit['password'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->instance->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => isset($app->user->account) ? $app->user->account : '');
$config->instance->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->instance->form->install = array();
diff --git a/module/instance/control.php b/module/instance/control.php
index 1228c49bf1..9b42eb9b8f 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -203,7 +203,9 @@ class instance extends control
$this->loadModel('sonarqube');
$this->app->loadLang('pipeline');
- $externalApp = form::data($this->config->instance->form->create)->get();
+ $externalApp = form::data($this->config->instance->form->create)
+ ->add('createdBy', isset($this->app->user->account) ? $this->app->user->account : '')
+ ->get();
$externalApp->type = $type;
$externalApp->url = rtrim($externalApp->url, '/');
if(!$this->instance->checkAppNameUnique($externalApp->name)) return $this->send(array('result' => false, 'message' => array('name' => sprintf($this->lang->error->repeat, $this->lang->pipeline->name, $externalApp->name))));
@@ -231,7 +233,9 @@ class instance extends control
if($_POST)
{
- $instance = form::data($this->config->instance->form->edit)->get();
+ $instance = form::data($this->config->instance->form->edit)
+ ->add('editedBy', isset($this->app->user->account) ? $this->app->user->account : '')
+ ->get();
$this->pipeline->update($externalID, $instance);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/jenkins/config/form.php b/module/jenkins/config/form.php
index a14c156a54..f34be8761f 100644
--- a/module/jenkins/config/form.php
+++ b/module/jenkins/config/form.php
@@ -1,5 +1,4 @@
jenkins->form = new stdclass();
$config->jenkins->form->create = array();
@@ -10,7 +9,6 @@ $config->jenkins->form->create['url'] = array('type' => 'string', 'req
$config->jenkins->form->create['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->jenkins->form->create['token'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
$config->jenkins->form->create['password'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->jenkins->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->jenkins->form->create['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => helper::now());
$config->jenkins->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -20,5 +18,4 @@ $config->jenkins->form->edit['url'] = array('type' => 'string', 'requir
$config->jenkins->form->edit['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->jenkins->form->edit['token'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
$config->jenkins->form->edit['password'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->jenkins->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->jenkins->form->edit['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => helper::now());
diff --git a/module/jenkins/control.php b/module/jenkins/control.php
index 70c7154c37..06a0a99e62 100644
--- a/module/jenkins/control.php
+++ b/module/jenkins/control.php
@@ -38,7 +38,9 @@ class jenkins extends control
{
if($_POST)
{
- $jenkins = form::data($this->config->jenkins->form->create)->get();
+ $jenkins = form::data($this->config->jenkins->form->create)
+ ->add('createdBy', $this->app->user->account)
+ ->get();
$this->jenkinsZen->checkTokenAccess($jenkins->url, $jenkins->account, $jenkins->password, $jenkins->token);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -63,7 +65,9 @@ class jenkins extends control
$jenkins = $this->loadModel('pipeline')->getByID($jenkinsID);
if($_POST)
{
- $jenkins = form::data($this->config->jenkins->form->edit)->get();
+ $jenkins = form::data($this->config->jenkins->form->edit)
+ ->add('editedBy', $this->app->user->account)
+ ->get();
$this->jenkinsZen->checkTokenAccess($jenkins->url, $jenkins->account, $jenkins->password, $jenkins->token);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/job/config/form.php b/module/job/config/form.php
index e0eb0bfc54..b5d85e03b7 100644
--- a/module/job/config/form.php
+++ b/module/job/config/form.php
@@ -1,7 +1,6 @@
job->form = new stdclass();
$config->job->form->create = array();
@@ -23,7 +22,6 @@ $config->job->form->create['jkServer'] = array('type' => 'int', 'requi
$config->job->form->create['jkTask'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->job->form->create['paramName'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->job->form->create['paramValue'] = array('type' => 'array', 'required' => false, 'default' => array());
-$config->job->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->job->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => $now);
$config->job->form->edit = array();
@@ -45,5 +43,4 @@ $config->job->form->edit['jkServer'] = array('type' => 'int', 'require
$config->job->form->edit['jkTask'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->job->form->edit['paramName'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->job->form->edit['paramValue'] = array('type' => 'array', 'required' => false, 'default' => array());
-$config->job->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->job->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => $now);
diff --git a/module/job/control.php b/module/job/control.php
index c3d518f6be..bc188b37a1 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -100,6 +100,7 @@ class job extends control
->setIF($this->post->useZentao != '1' || $this->post->triggerType != 'tag', 'lastTag', '')
->setIF($this->post->frame != 'sonarqube', 'sonarqubeServer', 0)
->setIF($this->post->frame != 'sonarqube', 'projectKey', '')
+ ->add('createdBy', $this->app->user->account)
->get();
$jobID = $this->job->create($job);
@@ -142,6 +143,7 @@ class job extends control
->setIF($this->post->useZentao != '1' || $this->post->triggerType != 'tag', 'lastTag', '')
->setIF($this->post->frame != 'sonarqube', 'sonarqubeServer', 0)
->setIF($this->post->frame != 'sonarqube', 'projectKey', '')
+ ->add('editedBy', $this->app->user->account)
->get();
$this->job->update($jobID, $job);
diff --git a/module/kanban/config/form.php b/module/kanban/config/form.php
index c9e1a9ad8d..833d9ca9ba 100644
--- a/module/kanban/config/form.php
+++ b/module/kanban/config/form.php
@@ -14,15 +14,15 @@ $config->kanban->form->createSpace['desc'] = array('type' => 'string', 're
$config->kanban->form->editSpace = $config->kanban->form->createSpace;
$config->kanban->form->activateSpace['status'] = array('type' => 'string', 'required' => true, 'default' => 'active');
-$config->kanban->form->activateSpace['activatedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->activateSpace['activatedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->activateSpace['activatedDate'] = array('type' => 'datetime', 'required' => true, 'default' => $now);
-$config->kanban->form->activateSpace['lastEditedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->activateSpace['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->activateSpace['lastEditedDate'] = array('type' => 'datetime', 'required' => true, 'default' => $now);
$config->kanban->form->closeSpace['status'] = array('type' => 'string', 'required' => true, 'default' => 'closed');
-$config->kanban->form->closeSpace['closedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->closeSpace['closedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->closeSpace['closedDate'] = array('type' => 'datetime', 'required' => true, 'default' => $now);
-$config->kanban->form->closeSpace['lastEditedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->closeSpace['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->closeSpace['lastEditedDate'] = array('type' => 'datetime', 'required' => true, 'default' => $now);
$config->kanban->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '');
@@ -39,7 +39,7 @@ $config->kanban->form->create['performable'] = array('type' => 'string', 'req
$config->kanban->form->create['alignment'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->create['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
$config->kanban->form->create['whitelist'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
-$config->kanban->form->create['createdBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->create['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->kanban->form->create['copyKanbanID'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->kanban->form->create['copyRegion'] = array('type' => 'string', 'required' => false, 'default' => '0');
@@ -49,7 +49,7 @@ $config->kanban->form->edit['space'] = array('type' => 'int', 'req
$config->kanban->form->edit['owner'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->edit['team'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->kanban->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
-$config->kanban->form->edit['lastEditedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->edit['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->edit['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->kanban->form->setting['showWIP'] = array('type' => 'string', 'required' => false, 'default' => '');
@@ -62,15 +62,15 @@ $config->kanban->form->setting['performable'] = array('type' => 'string', 'req
$config->kanban->form->setting['alignment'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->activate['status'] = array('type' => 'string', 'required' => true, 'default' => 'active');
-$config->kanban->form->activate['activatedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->activate['activatedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->activate['activatedDate'] = array('type' => 'datetime', 'required' => true, 'default' => $now);
-$config->kanban->form->activate['lastEditedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->activate['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->activate['lastEditedDate'] = array('type' => 'datetime', 'required' => true, 'default' => $now);
$config->kanban->form->close['status'] = array('type' => 'string', 'required' => true, 'default' => 'closed');
-$config->kanban->form->close['closedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->close['closedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->close['closedDate'] = array('type' => 'datetime', 'required' => true, 'default' => $now);
-$config->kanban->form->close['lastEditedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->close['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->close['lastEditedDate'] = array('type' => 'datetime', 'required' => true, 'default' => $now);
$config->kanban->form->createLane['name'] = array('type' => 'string', 'required' => true, 'default' => '');
@@ -98,7 +98,7 @@ $config->kanban->form->createCard['assignedTo'] = array('type' => 'array',
$config->kanban->form->createCard['begin'] = array('type' => 'date', 'required' => false, 'default' => '');
$config->kanban->form->createCard['end'] = array('type' => 'date', 'required' => false, 'default' => '');
$config->kanban->form->createCard['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
-$config->kanban->form->createCard['createdBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->createCard['createdBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->createCard['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->kanban->form->createCard['assignedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->kanban->form->createCard['color'] = array('type' => 'string', 'required' => false, 'default' => '#fff');
@@ -112,7 +112,7 @@ $config->kanban->form->editCard['assignedTo'] = array('type' => 'array',
$config->kanban->form->editCard['begin'] = array('type' => 'date', 'required' => false, 'default' => '');
$config->kanban->form->editCard['end'] = array('type' => 'date', 'required' => false, 'default' => '');
$config->kanban->form->editCard['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
-$config->kanban->form->editCard['lastEditedBy'] = array('type' => 'string', 'required' => true, 'default' => $app->user->account);
+$config->kanban->form->editCard['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->kanban->form->editCard['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->kanban->form->batchCreateCard['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'base' => 'true');
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 67ddff6975..22051bd2a9 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -129,6 +129,8 @@ class kanban extends control
$space = form::data($this->config->kanban->form->activateSpace)
->add('closedBy', '')
->add('closedDate', null)
+ ->add('activatedBy', $this->app->user->account)
+ ->add('lastEditedBy', $this->app->user->account)
->get();
$this->kanban->activateSpace($spaceID, $space);
@@ -160,6 +162,8 @@ class kanban extends control
$space = form::data($this->config->kanban->form->closeSpace)
->add('activatedBy', '')
->add('activatedDate', null)
+ ->add('closedBy', $this->app->user->account)
+ ->add('lastEditedBy', $this->app->user->account)
->get();
$this->kanban->closeSpace($spaceID, $space);
@@ -205,7 +209,9 @@ class kanban extends control
{
if(!empty($_POST))
{
- $kanban = form::data($this->config->kanban->form->create)->get();
+ $kanban = form::data($this->config->kanban->form->create)
+ ->setDefault('createdBy', $this->app->user->account)
+ ->get();
$this->kanban->create($kanban);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -227,7 +233,9 @@ class kanban extends control
{
if(!empty($_POST))
{
- $kanban = form::data($this->config->kanban->form->edit)->get();
+ $kanban = form::data($this->config->kanban->form->edit)
+ ->setDefault('lastEditedBy', $this->app->user->account)
+ ->get();
$this->kanban->update($kanbanID, $kanban);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -297,6 +305,8 @@ class kanban extends control
$kanban = form::data($this->config->kanban->form->activate)
->setDefault('closedBy', '')
->setDefault('closedDate', null)
+ ->setDefault('activatedBy', $this->app->user->account)
+ ->setDefault('lastEditedBy', $this->app->user->account)
->get();
$this->kanban->activate($kanbanID, $kanban);
@@ -327,6 +337,8 @@ class kanban extends control
$kanban = form::data($this->config->kanban->form->close)
->setDefault('activatedBy', '')
->setDefault('activatedDate', null)
+ ->setDefault('closedBy', $this->app->user->account)
+ ->setDefault('lastEditedBy', $this->app->user->account)
->get();
$this->kanban->close($kanbanID, $kanban);
@@ -745,6 +757,7 @@ class kanban extends control
->add('kanban', $kanbanID)
->add('region', $regionID)
->add('group', $groupID)
+ ->setDefault('createdBy', $this->app->user->account)
->get();
$this->kanban->createCard($columnID, $card);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -810,7 +823,9 @@ class kanban extends control
{
if(!empty($_POST))
{
- $card = form::data($this->config->kanban->form->editCard)->get();
+ $card = form::data($this->config->kanban->form->editCard)
+ ->setDefault('lastEditedBy', $this->app->user->account)
+ ->get();
$this->kanban->updateCard($cardID, $card);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/kanban/tao.php b/module/kanban/tao.php
index acadced9b5..66eaefa2fd 100644
--- a/module/kanban/tao.php
+++ b/module/kanban/tao.php
@@ -910,6 +910,8 @@ class kanbanTao extends kanbanModel
*/
protected function getStoryCardMenu(int $executionID, array $objects): array
{
+ $execution = $this->loadModel('execution')->getByID($executionID);
+
$menus = array();
$objects = $this->loadModel('story')->mergeReviewer($objects);
foreach($objects as $story)
@@ -923,7 +925,7 @@ class kanbanTao extends kanbanModel
if(common::hasPriv('task', 'create') and $toTaskPriv) $menu[] = array('label' => $this->lang->execution->wbs, 'icon' => 'plus', 'url' => helper::createLink('task', 'create', "executionID=$executionID&storyID=$story->id&moduleID=$story->module"), 'modal' => true, 'size' => 'lg');
if(common::hasPriv('task', 'batchCreate') and $toTaskPriv) $menu[] = array('label' => $this->lang->execution->batchWBS, 'icon' => 'pluses', 'url' => helper::createLink('task', 'batchCreate', "executionID=$executionID&storyID=$story->id&moduleID=0&taskID=0&iframe=true"), 'modal' => true, 'size' => 'lg');
if(common::hasPriv('story', 'activate') and $this->story->isClickable($story, 'activate')) $menu[] = array('label' => $this->lang->story->activate, 'icon' => 'magic', 'url' => helper::createLink('story', 'activate', "storyID=$story->id"), 'modal' => true, 'size' => 'lg');
- if(common::hasPriv('execution', 'unlinkStory')) $menu[] = array('label' => $this->lang->execution->unlinkStory, 'icon' => 'unlink', 'url' => helper::createLink('execution', 'unlinkStory', "executionID=$executionID&storyID=$story->story&confirm=no&from=taskkanban"));
+ if(common::hasPriv('execution', 'unlinkStory') && $execution->hasProduct) $menu[] = array('label' => $this->lang->execution->unlinkStory, 'icon' => 'unlink', 'url' => helper::createLink('execution', 'unlinkStory', "executionID=$executionID&storyID=$story->story&confirm=no&from=taskkanban"));
if(common::hasPriv('story', 'delete')) $menu[] = array('label' => $this->lang->story->delete, 'icon' => 'trash', 'url' => helper::createLink('story', 'delete', "storyID=$story->id&confirm=no&from=taskkanban"));
$menus[$story->id] = $menu;
diff --git a/module/metric/calc/product/scale/count_of_annual_created_requirement_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_requirement_in_product.php
index 897cadb690..73776f5898 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_requirement_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_requirement_in_product.php
@@ -32,7 +32,7 @@ class count_of_annual_created_requirement_in_product extends baseCalc
$type = $data->type;
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
+ if(empty($openedDate) || $type != 'requirement') return false;
$year = substr($openedDate, 0, 4);
if($year == '0000') return false;
diff --git a/module/metric/control.php b/module/metric/control.php
index 2fe03a5da6..d46dedaf24 100755
--- a/module/metric/control.php
+++ b/module/metric/control.php
@@ -158,126 +158,6 @@ class metric extends control
$this->display();
}
- /**
- * 计算一个度量项的历史数据。
- * Update history metric lib of single metric.
- *
- * @param string $code
- * @param string $date
- * @param string $calcType
- * @access public
- * @return void
- */
- public function ajaxUpdateSingleMetricLib($code, $date, $calcType)
- {
- $date = str_replace('_', '-', $date);
- $dateType = $this->metric->getDateTypeByCode($code);
-
- if($calcType == 'inference') $isCalcByCron = $this->metric->isCalcByCron($code, $date, $dateType);
-
- if($calcType == 'all' || !$isCalcByCron)
- {
- $calc = $this->metric->calculateMetricByCode($code);
- $record = $this->metricZen->getRecordByCodeAndDate($code, $calc, $date);
-
- $records = array();
- $records[$code] = $record;
- $this->metric->insertMetricLib($records, 'inference');
- }
- }
-
- /**
- * 计算历史数据。
- * Update metric lib of history.
- *
- * @param string $date
- * @param string $calcType
- * @access public
- * @return void
- */
- public function ajaxUpdateHistoryMetricLib($date, $calcType)
- {
- $date = str_replace('_', '-', $date);
- $calcList = $this->metric->getCalcInstanceList();
-
- $classifiedCalcGroup = json_decode(file_get_contents($this->app->getTmpRoot() . 'calc'));
-
- $records = array();
- foreach($classifiedCalcGroup as $calcGroup)
- {
- foreach($calcGroup->calcList as $code => $calc)
- {
- if($calcType == 'inference')
- {
- $dateType = $this->metric->getDateTypeByCode($code);
- if($dateType == 'nodate') continue;
-
- $isCalcByCron = $this->metric->isCalcByCron($code, $date, $dateType);
- if($isCalcByCron) continue;
- }
-
- $calcObj = $calcList[$code];
- $calcObj->result = json_decode(json_encode($calc->result), true);
- $inferenceRecord = $this->metricZen->getRecordByCodeAndDate($code, $calcObj, $date);
- if(!empty($inferenceRecord)) $records[$code] = $inferenceRecord;
- }
- }
- $this->metric->insertMetricLib($records, 'inference');
- }
-
- /**
- * 保存计算后的度量项对象。
- * Save calculated metric to file.
- *
- * @access public
- * @return void
- */
- public function ajaxSaveCalculatedMetrics()
- {
- $calcList = $this->metric->getCalcInstanceList();
- $classifiedCalcGroup = $this->metric->classifyCalc($calcList);
-
- foreach($classifiedCalcGroup as $calcGroup)
- {
- if($this->config->edition == 'open' and in_array($calcGroup->dataset, array('getFeedbacks', 'getIssues', 'getRisks'))) continue;
- if($this->config->edition == 'biz' and in_array($calcGroup->dataset, array('getIssues', 'getRisks'))) continue;
-
- try
- {
- $statement = $this->metricZen->prepareDataset($calcGroup);
- if(empty($statement)) continue;
-
- $rows = $statement->fetchAll();
- $this->metricZen->calcMetric($rows, $calcGroup->calcList);
-
- foreach($calcGroup->calcList as $calc) $calc->setDAO(null);
- }
- catch(Exception $e)
- {
- a($this->metricZen->formatException($e));
- }
- catch(Error $e)
- {
- a($this->metricZen->formatException($e));
- }
- }
-
- file_put_contents($this->app->getTmpRoot() . 'calc', json_encode($classifiedCalcGroup));
- }
-
- /**
- * 删除重复度量库数据。
- * Delete duplication record in metric data.
- *
- * @access public
- * @return void
- */
- public function ajaxDeduplicateRecord()
- {
- $metrics = $this->metric->getExecutableMetric();
- foreach($metrics as $code) $this->metric->deduplication($code);
- }
-
/**
* 计算度量项。
* Execute metric.
@@ -324,6 +204,7 @@ class metric extends control
$metrics = $this->metric->getExecutableMetric();
foreach($metrics as $code) $this->metric->deduplication($code);
+ $this->metric->rebuildPrimaryKey();
// 恢复之前的调试状态
$this->config->debug = $originalDebug;
@@ -483,50 +364,6 @@ class metric extends control
$this->display();
}
- /**
- * 重算度量项历史数据。
- * Recalculate metric history data.
- *
- * @param string $calcRange all|single
- * @param string $code
- * @access public
- * @return string
- */
- public function recalculateSetting($calcRange= 'all', $code = '')
- {
- $this->view->calcRange = $calcRange;
- $this->view->code = $code;
- $this->display();
- }
-
- /**
- * 重算度量项进度。
- * Show recalculate progress.
- *
- * @param string $calcType all|inference
- * @param string $calcRange all|single
- * @param string $code
- * @access public
- * @return string
- */
- public function recalculate($calcType, $calcRange = 'all', $code = '')
- {
- $metric = !empty($code) ? $this->metric->getByCode($code) : '';
- $dateType = !empty($code) ? $this->metric->getDateTypeByCode($code) : '';
-
- $startDate = $this->metric->getInstallDate();
- $endDate = helper::now();
-
- $this->view->code = $code;
- $this->view->metric = $metric;
- $this->view->dateType = $dateType;
- $this->view->calcType = $calcType;
- $this->view->calcRange = $calcRange;
- $this->view->startDate = substr($startDate, 0, 10);
- $this->view->endDate = substr($endDate, 0, 10);
- $this->display();
- }
-
/**
* 获取数据表格的数据。
* Get data of datatable.
diff --git a/module/metric/css/preview.ui.css b/module/metric/css/preview.ui.css
index df9de03cba..d6e3e207bc 100644
--- a/module/metric/css/preview.ui.css
+++ b/module/metric/css/preview.ui.css
@@ -4,8 +4,8 @@
#mainContent .side {overflow-x: hidden; padding-right: 4px;}
#mainContent .main {overflow-x: hidden;}
-#featureBar .nav-feature li:last-child {padding-left: 4px;}
-#featureBar .nav-feature li:nth-last-child(2):before {content: ""; position: absolute; left: 2px; top: 5px; right: 0; bottom: 5px; width: 1px; background-color: var(--color-gray-300);}
+#featureBar .nav-feature li.divider-before {padding-left: 4px;}
+#featureBar .nav-feature li.divider-before:before {content: ""; position: absolute; left: -1px; top: 5px; bottom: 5px; width: 1px; background-color: var(--color-gray-300);}
.filter-btn {padding-left: 0.625rem !important; padding-right: 0.625rem !important;}
diff --git a/module/metric/js/preview.ui.js b/module/metric/js/preview.ui.js
index 3bf9e03dfc..adc01b2cd8 100644
--- a/module/metric/js/preview.ui.js
+++ b/module/metric/js/preview.ui.js
@@ -21,6 +21,7 @@ window.afterPageUpdate = function($target, info, options)
}
window.addTitle2Star();
+ window.addDivider();
window.initFilterPanel();
}
@@ -41,6 +42,13 @@ window.addTitle2Star = function()
$('.metric-collect').attr('title', collectStar);
}
+window.addDivider = function()
+{
+ let features = $('#featureBar .nav-feature').find('li.nav-item');
+ let lastItem = features[features.length - 1];
+ $(lastItem).addClass('divider-before');
+}
+
/* 事件处理函数。 */
window.handleCheckboxChange = function($el)
{
@@ -83,7 +91,7 @@ window.handleFilterCheck = function()
window.handleFilterToggle = function($el)
{
- $el.toggleClass('primary-600');
+ $el.toggleClass('ring-primary');
$('.filter-panel').toggleClass('hidden');
}
@@ -274,10 +282,10 @@ window.initFilterPanel = function()
$('#mainMenu').after($('.filter-panel'));
- $('.filter-btn').removeClass('primary-600');
+ $('.filter-btn').removeClass('ring-primary');
if(scope == 'filter')
{
- $('.filter-btn').addClass('primary-600');
+ $('.filter-btn').addClass('ring-primary');
$('.filter-panel').removeClass('hidden');
window.updateFilterCheck();
}
@@ -697,7 +705,7 @@ window.genDataZoom = function(dataLength, initZoom = 10, axis = 'x')
window.hideFilterPanel = function()
{
- $('.filter-btn').removeClass('primary-600');
+ $('.filter-btn').removeClass('ring-primary');
$('.filter-panel').addClass('hidden');
}
diff --git a/module/metric/model.php b/module/metric/model.php
index 382e3c3124..a54f10e3bb 100755
--- a/module/metric/model.php
+++ b/module/metric/model.php
@@ -833,6 +833,18 @@ class metricModel extends model
return dao::isError();
}
+ /**
+ * 重建主键顺序。
+ * Rebuild primary key order.
+ *
+ * @access public
+ * @return void
+ */
+ public function rebuildPrimaryKey()
+ {
+ $this->metricTao->rebuildIdColumn();
+ }
+
/**
* 根据度量项收集周期来清理过期的度量库数据。
* Clear outdated metric records by cycle.
@@ -1230,6 +1242,7 @@ class metricModel extends model
->where('deleted')->eq(0)
->andWhere('shadow')->eq(0)
->andWhere('createdDate')->le($date)
+ ->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
->andWhere("vision LIKE '%{$vision}%'", true)
->orWhere("vision IS NULL")->markRight(1)
->fetchPairs();
@@ -1239,6 +1252,7 @@ class metricModel extends model
->where('deleted')->eq(0)
->andWhere('type')->eq('project')
->andWhere('openedDate')->le($date)
+ ->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
->andWhere("vision LIKE '%{$vision}%'", true)
->orWhere("vision IS NULL")->markRight(1)
->fetchPairs();
@@ -1248,6 +1262,7 @@ class metricModel extends model
->where('deleted')->eq(0)
->andWhere('type')->in('sprint,stage,kanban')
->andWhere('openedDate')->le($date)
+ ->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
->andWhere("vision LIKE '%{$vision}%'", true)
->orWhere("vision IS NULL")->markRight(1)
->fetchPairs();
@@ -2611,6 +2626,14 @@ class metricModel extends model
*/
public function getInstallDate()
{
+ $installedDate = $this->dao->select('value')->from(TABLE_CONFIG)
+ ->where('section')->eq('global')
+ ->andWhere('key')->eq('installedDate')
+ ->limit(1)
+ ->fetch('value');
+
+ if(!empty($installedDate) && substr($installedDate, 0 ,4) == '0000') return $installedDate;
+
return $this->dao->select('date')->from(TABLE_ACTION)
->orderBy('date_asc')
->limit(1)
diff --git a/module/metric/tao.php b/module/metric/tao.php
index 87c7d9a226..123818c5a9 100644
--- a/module/metric/tao.php
+++ b/module/metric/tao.php
@@ -474,10 +474,11 @@ class metricTao extends metricModel
$intersect = array_intersect($fields, array('year', 'month', 'week', 'day'));
foreach($fields as $key => $field) $fields[$key] = "`$field`";
if(empty($intersect)) $fields[] = 'left(date, 10)';
+ $table = TABLE_METRICLIB;
$sql = "INSERT INTO `metriclib_distinct` (id) ";
$sql .= "SELECT MAX(id) AS id ";
- $sql .= "FROM zt_metriclib WHERE metricCode = '{$code}' ";
+ $sql .= "FROM $table WHERE metricCode = '{$code}' ";
$sql .= "GROUP BY " . implode(',', $fields);
$this->dao->exec($sql);
@@ -493,7 +494,8 @@ class metricTao extends metricModel
*/
protected function deleteDuplicationRecord(string $code): void
{
- $sql = "DELETE FROM zt_metriclib ";
+ $table = TABLE_METRICLIB;
+ $sql = "DELETE FROM $table ";
$sql .= "WHERE id NOT IN (SELECT id FROM metriclib_distinct) ";
$sql .= "AND metricCode = '{$code}'";
@@ -511,4 +513,20 @@ class metricTao extends metricModel
{
$this->dao->exec("DROP TABLE IF EXISTS `metriclib_distinct`");
}
+
+ /**
+ * 重建id列顺序。
+ * Rebuild id column order.
+ *
+ * @access protected
+ * @return void
+ */
+ protected function rebuildIdColumn(): void
+ {
+ $table = TABLE_METRICLIB;
+ $tableRowCount = $this->dao->select('COUNT(id) as rowcount')->from(TABLE_METRICLIB)->fetch('rowcount');
+ $autoIncrement = $tableRowCount + 1;
+ $this->dao->exec("SET @count = 0;UPDATE $table SET `id` = @count:= @count + 1;");
+ $this->dao->exec("ALTER TABLE $table AUTO_INCREMENT = $autoIncrement");
+ }
}
diff --git a/module/metric/ui/component/filterpanel.html.php b/module/metric/ui/component/filterpanel.html.php
index 08f435844f..872ede2348 100644
--- a/module/metric/ui/component/filterpanel.html.php
+++ b/module/metric/ui/component/filterpanel.html.php
@@ -44,7 +44,7 @@ $fnGenerateFilterContent = function($filterItems) use($lang, $fnGenerateFilterBl
(
btn
(
- setClass('btn ghost filter-btn'),
+ setClass('search-form-toggle rounded-full gray-300-outline size-sm btn filter-btn'),
set::icon('search'),
bind::click('window.handleFilterToggle($element)'),
span
diff --git a/module/metric/ui/previewsingle.html.php b/module/metric/ui/previewsingle.html.php
index 149764e23e..22720c0a76 100644
--- a/module/metric/ui/previewsingle.html.php
+++ b/module/metric/ui/previewsingle.html.php
@@ -37,7 +37,8 @@ $fnGenerateSide = function() use($groupMetrics, $current, $viewType, $scope, $la
$metricList[] = li
(
set::className($class . ' metric-item font-medium'),
- a(
+ a
+ (
$metric->name,
set::href(helper::createLink('metric', 'preview', $params))
)
diff --git a/module/metric/zen.php b/module/metric/zen.php
index 718dc6b579..bee105e654 100644
--- a/module/metric/zen.php
+++ b/module/metric/zen.php
@@ -291,14 +291,9 @@ class metricZen extends metric
}
else
{
- if($date == 'now')
- {
- $scopeList = $this->metric->getPairsByScope($scope);
- }
- else
- {
- $scopeList = $this->metric->getPairsByScopeAndDate($scope, $date);
- }
+ if($date == 'now') $date = helper::today();
+
+ $scopeList = $this->metric->getPairsByScopeAndDate($scope, $date);
foreach($scopeList as $key => $value)
{
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index 1f77cb073a..36e7ad8bd9 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -113,7 +113,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
-$lang->misc->releaseDate['20.0'] = '2024-04-15';
+$lang->misc->releaseDate['20.0'] = '2024-04-23';
$lang->misc->releaseDate['18.12'] = '2024-04-12';
$lang->misc->releaseDate['20.0.beta2'] = '2024-03-15';
$lang->misc->releaseDate['18.11'] = '2024-02-28';
@@ -226,7 +226,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
-$lang->misc->feature->all['20.0'][] = array('title' => "", 'desc' => '');
+$lang->misc->feature->all['20.0'][] = array('title' => 'In this upgrade, we have reconstructed the underlying PHP and UI frameworks, revamped the core forms and dashboards, resulting in a completely elevated user experience.', 'desc' => '');
$lang->misc->feature->all['18.12'][] = array('title' => "To better streamline our services, we have discontinued information and associated evaluations for non-R&D users, while implementing timely reminders for impending technical service deadlines. Our latest update includes a comprehensive approach to metric management, offering customizable metrics, a robust library of foundational metrics, and the convenience of recalculating historical metric data at one click. Additionally, we are excited to introduce the demand pool matrix, enabling the removal of approved demands from roadmaps. Furthermore, our Operations Management Interface has been enhanced with the addition of feedback settings. In addition, we have introduced the 'Associated Demand Pool' search criterion, making it easier for users to search for requirements within the demand pool.", 'desc' => '');
$lang->misc->feature->all['20.0.beta2'][] = array('title' => 'Enhance the functionality and fine-tune the details, while addressing any known bugs.', 'desc' => '');
$lang->misc->feature->all['18.11'][] = array('title' => "We have successfully implemented AI mini-program functionality, integrating measurement metrics and global filtering capabilities into the large-screen display. Additionally, we have added feedback functionality to the OR interface. Furthermore, we have enabled the inclusion of keywords in the Requirement Management Hub, allowing for the redistribution of requirements in the Requirement Management Hub once a user's requirement has been withdrawn.", 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 64d9948d88..94ac3174e4 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -113,7 +113,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
-$lang->misc->releaseDate['20.0'] = '2024-04-15';
+$lang->misc->releaseDate['20.0'] = '2024-04-23';
$lang->misc->releaseDate['18.12'] = '2024-04-12';
$lang->misc->releaseDate['20.0.beta2'] = '2024-03-15';
$lang->misc->releaseDate['18.11'] = '2024-02-28';
@@ -226,7 +226,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
-$lang->misc->feature->all['20.0'][] = array('title' => "", 'desc' => '');
+$lang->misc->feature->all['20.0'][] = array('title' => 'In this upgrade, we have reconstructed the underlying PHP and UI frameworks, revamped the core forms and dashboards, resulting in a completely elevated user experience.', 'desc' => '');
$lang->misc->feature->all['18.12'][] = array('title' => "To better streamline our services, we have discontinued information and associated evaluations for non-R&D users, while implementing timely reminders for impending technical service deadlines. Our latest update includes a comprehensive approach to metric management, offering customizable metrics, a robust library of foundational metrics, and the convenience of recalculating historical metric data at one click. Additionally, we are excited to introduce the demand pool matrix, enabling the removal of approved demands from roadmaps. Furthermore, our Operations Management Interface has been enhanced with the addition of feedback settings. In addition, we have introduced the 'Associated Demand Pool' search criterion, making it easier for users to search for requirements within the demand pool.", 'desc' => '');
$lang->misc->feature->all['20.0.beta2'][] = array('title' => 'Enhance the functionality and fine-tune the details, while addressing any known bugs.', 'desc' => '');
$lang->misc->feature->all['18.11'][] = array('title' => "We have successfully implemented AI mini-program functionality, integrating measurement metrics and global filtering capabilities into the large-screen display. Additionally, we have added feedback functionality to the OR interface. Furthermore, we have enabled the inclusion of keywords in the Requirement Management Hub, allowing for the redistribution of requirements in the Requirement Management Hub once a user's requirement has been withdrawn.", 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index dd4f22df07..e234b89f6a 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -113,7 +113,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
-$lang->misc->releaseDate['20.0'] = '2024-04-15';
+$lang->misc->releaseDate['20.0'] = '2024-04-23';
$lang->misc->releaseDate['18.12'] = '2024-04-12';
$lang->misc->releaseDate['20.0.beta2'] = '2024-03-15';
$lang->misc->releaseDate['18.11'] = '2024-02-28';
@@ -226,7 +226,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
-$lang->misc->feature->all['20.0'][] = array('title' => "", 'desc' => '');
+$lang->misc->feature->all['20.0'][] = array('title' => 'In this upgrade, we have reconstructed the underlying PHP and UI frameworks, revamped the core forms and dashboards, resulting in a completely elevated user experience.', 'desc' => '');
$lang->misc->feature->all['18.12'][] = array('title' => "To better streamline our services, we have discontinued information and associated evaluations for non-R&D users, while implementing timely reminders for impending technical service deadlines. Our latest update includes a comprehensive approach to metric management, offering customizable metrics, a robust library of foundational metrics, and the convenience of recalculating historical metric data at one click. Additionally, we are excited to introduce the demand pool matrix, enabling the removal of approved demands from roadmaps. Furthermore, our Operations Management Interface has been enhanced with the addition of feedback settings. In addition, we have introduced the 'Associated Demand Pool' search criterion, making it easier for users to search for requirements within the demand pool.", 'desc' => '');
$lang->misc->feature->all['20.0.beta2'][] = array('title' => 'Enhance the functionality and fine-tune the details, while addressing any known bugs.', 'desc' => '');
$lang->misc->feature->all['18.11'][] = array('title' => "We have successfully implemented AI mini-program functionality, integrating measurement metrics and global filtering capabilities into the large-screen display. Additionally, we have added feedback functionality to the OR interface. Furthermore, we have enabled the inclusion of keywords in the Requirement Management Hub, allowing for the redistribution of requirements in the Requirement Management Hub once a user's requirement has been withdrawn.", 'desc' => '');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 9fa8678b0f..51a7e09801 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -113,7 +113,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
-$lang->misc->releaseDate['20.0'] = '2024-04-15';
+$lang->misc->releaseDate['20.0'] = '2024-04-23';
$lang->misc->releaseDate['18.12'] = '2024-04-12';
$lang->misc->releaseDate['20.0.beta2'] = '2024-03-15';
$lang->misc->releaseDate['18.11'] = '2024-02-28';
@@ -226,7 +226,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
-$lang->misc->feature->all['20.0'][] = array('title' => "", 'desc' => '');
+$lang->misc->feature->all['20.0'][] = array('title' => '重构底层PHP和UI框架，重构核心表单和仪表盘，用户体验全新升级。', 'desc' => '');
$lang->misc->feature->all['18.12'][] = array('title' => '禅道新版本中取消非研发用户的信息和相关判断，技术服务临期增加提醒。实现度量项条目化管理、自定义度量项、基础度量库、一键重算历史度量数据。需求池需求矩阵，路标支持移除已立项需求，运营管理界面增加反馈设置功能，需求池需求搜索条件中增加所属需求池搜索条件。', 'desc' => '');
$lang->misc->feature->all['20.0.beta2'][] = array('title' => '完善细节功能，解已知Bug。', 'desc' => '');
$lang->misc->feature->all['18.11'][] = array('title' => '实现AI小程序功能，实现大屏引用度量项、全局筛选器功能,OR界面实现反馈功能，需求池需求增加关键词，撤回用户需求后需求池需求可以再次分发。', 'desc' => '');
diff --git a/module/mr/config/dtable.php b/module/mr/config/dtable.php
index 6015120b54..15a7169375 100644
--- a/module/mr/config/dtable.php
+++ b/module/mr/config/dtable.php
@@ -80,7 +80,7 @@ $config->mr->taskDtable->fieldList['pri']['show'] = true;
$config->mr->taskDtable->fieldList['assignedTo']['type'] = 'desc';
$config->mr->taskDtable->fieldList['assignedTo']['title'] = $lang->task->assignedTo;
-$config->mr->taskDtable->fieldList['assignedTo']['currentUser'] = $app->user->account;
+$config->mr->taskDtable->fieldList['assignedTo']['currentUser'] = '';
$config->mr->taskDtable->fieldList['assignedTo']['sortType'] = true;
$config->mr->taskDtable->fieldList['assignedTo']['show'] = true;
diff --git a/module/mr/config/form.php b/module/mr/config/form.php
index 78c38476b0..46eb0f0870 100644
--- a/module/mr/config/form.php
+++ b/module/mr/config/form.php
@@ -1,5 +1,4 @@
mr->form = new stdclass();
$config->mr->form->create = array();
$config->mr->form->create['hostID'] = array('type' => 'int', 'required' => true);
@@ -16,7 +15,6 @@ $config->mr->form->create['removeSourceBranch'] = array('type' => 'int', 'req
$config->mr->form->create['squash'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->mr->form->create['jobID'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->mr->form->create['description'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->mr->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->mr->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->mr->form->edit = array();
@@ -29,5 +27,4 @@ $config->mr->form->edit['removeSourceBranch'] = array('type' => 'int', 'requi
$config->mr->form->edit['squash'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->mr->form->edit['jobID'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->mr->form->edit['description'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->mr->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->mr->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
diff --git a/module/mr/control.php b/module/mr/control.php
index 56518cf143..436952fee3 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -196,6 +196,7 @@ class mr extends control
{
$MR = form::data($this->config->mr->form->create)
->setIF($this->post->needCI == 0, 'jobID', 0)
+ ->add('createdBy', $this->app->user->account)
->get();
$result = $this->mr->create($MR);
return $this->send($result);
@@ -260,6 +261,7 @@ class mr extends control
{
$MR = form::data($this->config->mr->form->edit)
->setIF($this->post->needCI == 0, 'jobID', 0)
+ ->add('editedBy', $this->app->user->account)
->get();
$result = $this->mr->update($MRID, $MR);
return $this->send($result);
diff --git a/module/mr/ui/link.html.php b/module/mr/ui/link.html.php
index e333af24c1..fbfa0b4a73 100644
--- a/module/mr/ui/link.html.php
+++ b/module/mr/ui/link.html.php
@@ -59,7 +59,9 @@ $bugCols['title']['link'] = array('module' => 'bug', 'method' => 'view',
$bugs = initTableData($bugs, $bugCols);
$taskCols = $config->mr->taskDtable->fieldList;
-$taskCols['actions'] = $actionMenu;
+$taskCols['assignedTo']['currentUser'] = $app->user->account;
+
+$taskCols['actions'] = $actionMenu;
$taskCols['actions']['list']['unlink']['data-confirm'] = $lang->mr->confirmUnlinkTask;
$taskCols['actions']['list']['unlink']['url'] = $this->createLink('mr', 'unlink', "MRID=$MR->id&productID=$product->id&type=task&linkID={id}&confirm=yes");
diff --git a/module/mr/ui/linktask.html.php b/module/mr/ui/linktask.html.php
index c013175ad3..eefd2514f5 100644
--- a/module/mr/ui/linktask.html.php
+++ b/module/mr/ui/linktask.html.php
@@ -46,6 +46,7 @@ div
$lang->repo->unlinkedTasks . "({$pager->recTotal})"
)
);
+$config->repo->taskDtable->fieldList['assignedTo']['currentUser'] = $app->user->account;
$allTasks = initTableData($allTasks, $config->repo->taskDtable->fieldList);
$data = array_values($allTasks);
dtable
diff --git a/module/my/config/table.php b/module/my/config/table.php
index 22fbb379a5..0090ac95b6 100644
--- a/module/my/config/table.php
+++ b/module/my/config/table.php
@@ -1132,4 +1132,3 @@ unset($config->my->team->dtable->fieldList['actions']);
$config->my->project = new stdclass();
$config->my->project->dtable = $config->project->dtable;
-
diff --git a/module/my/js/audit.ui.js b/module/my/js/audit.ui.js
index 9c54163578..6bf185dad9 100644
--- a/module/my/js/audit.ui.js
+++ b/module/my/js/audit.ui.js
@@ -17,6 +17,10 @@ window.onRenderCell = function(result, {row, col})
delete result[0].props.items[0]['href'];
}
}
+ if(result && col.name == 'title' && row.data.module == 'review')
+ {
+ result[0].props['data-toggle'] = '';
+ }
return result;
}
diff --git a/module/my/js/common.ui.js b/module/my/js/common.ui.js
index dde83f23b8..13705ac3b1 100644
--- a/module/my/js/common.ui.js
+++ b/module/my/js/common.ui.js
@@ -1,20 +1,31 @@
-$(function()
+window.updateMainNavbarBadges = function(options)
{
- if(typeof mode === 'string')
+ const rawMethod = options.rawMethod;
+ const mode = options.mode;
+ const isIPD = options.isIPD;
+ const isMax = options.isMax;
+ const isBiz = options.isBiz;
+ const isOpenedURAndSR = options.isOpenedURAndSR;
+ const todoCount = options.todoCount;
+
+ if(typeof mode !== 'string') return;
+
+ const $mainNavbar = $('#mainNavbar');
+ $mainNavbar.find('.nav-item > a[data-id=' + mode + ']').addClass('active');
+ if(rawMethod == 'work')
{
- const $mainNavbar = $('#mainNavbar');
- $mainNavbar.find('.nav-item > a[data-id=' + mode + ']').addClass('active');
- if(typeof rawMethod === 'string' && rawMethod == 'work')
+ const countMap = {task: 'task', story: 'story', bug: 'bug', testcase: 'case', testtask: 'testtask'};
+ if(isOpenedURAndSR !== 0) $.extend(countMap, {requirement: 'requirement'});
+ if(isBiz !== 0 || isMax !== 0 || isIPD !== 0) $.extend(countMap, {feedback: 'feedback', ticket: 'ticket'});
+ if(isMax !== 0 || isIPD !== 0) $.extend(countMap, {issue: 'issue', risk: 'risk', nc: 'qa', myMeeting: 'meeting'});
+ if(isIPD !== 0) $.extend(countMap, {demand: 'demand'});
+
+ $.each(countMap, (name, key) =>
{
- if($mainNavbar.find('.nav-item > a[data-id=task] .label').length) return false;
-
- const countMap = {task: 'task', story: 'story', bug: 'bug', testcase: 'case', testtask: 'testtask'};
- if(isOpenedURAndSR !== 0) $.extend(countMap, {requirement: 'requirement'});
- if(isBiz !== 0 || isMax !== 0 || isIPD !== 0) $.extend(countMap, {feedback: 'feedback', ticket: 'ticket'});
- if(isMax !== 0 || isIPD !== 0) $.extend(countMap, {issue: 'issue', risk: 'risk', nc: 'qa', myMeeting: 'meeting'});
- if(isIPD !== 0) $.extend(countMap, {demand: 'demand'});
-
- $.each(countMap, (name, key) => $mainNavbar.find('.nav-item > a[data-id=' + name + ']').append('' + todoCount[key] + ''));
- }
+ const $item = $mainNavbar.find('.nav-item > a[data-id=' + name + ']');
+ const $label = $item.find('.label');
+ if($label.length) $label.text(todoCount[key]);
+ else $item.append('' + todoCount[key] + '');
+ });
}
-});
+};
diff --git a/module/my/ui/audit.html.php b/module/my/ui/audit.html.php
index b753a01daf..284f0a9bbb 100644
--- a/module/my/ui/audit.html.php
+++ b/module/my/ui/audit.html.php
@@ -35,10 +35,10 @@ if($rawMethod != 'contribute' || $browseType != 'reviewedbyme') unset($config->m
foreach($reviewList as $review)
{
- $type = $review->type == 'prejectreview' ? 'review' : $review->type;
+ $type = $review->type == 'projectreview' ? 'review' : $review->type;
$isOAObject = strpos(",{$config->my->oaObjectType},", ",$type,") !== false ? true : false;
- $review->module = $review->type;
+ $review->module = $type;
if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
if($type == 'story') $typeName = $review->storyType == 'story' ? $lang->SRCommon : $lang->URCommon;
@@ -71,23 +71,6 @@ foreach($reviewList as $review)
$review->result = zget($reviewResultList, $review->result);
}
-
- $module = $type;
- $method = 'review';
- $params = "id=$review->id";
-
- if($isOAObject) $method = 'view';
- if(!in_array($module, array('demand', 'story', 'testcase', 'feedback'))) $method = 'approvalreview';
-
- if($module == 'review')
- {
- $method = 'assess';
- $params .= "&from={$rawMethod}";
-
- unset($config->my->audit->actionList['review']['data-toggle']);
- }
-
- $config->my->audit->actionList['review']['url'] = createLink($module, 'view', "id={$review->id}");
}
$reviewList = initTableData($reviewList, $config->my->audit->dtable->fieldList, $this->my);
diff --git a/module/my/ui/header.html.php b/module/my/ui/header.html.php
index 8bce147579..b5f197d2f6 100644
--- a/module/my/ui/header.html.php
+++ b/module/my/ui/header.html.php
@@ -10,10 +10,13 @@ declare(strict_types=1);
*/
namespace zin;
-jsVar('mode', $mode);
-jsVar('todoCount', $todoCount);
-jsVar('isIPD', $isIPD);
-jsVar('isMax', $isMax);
-jsVar('isBiz', $isBiz);
-jsVar('isOpenedURAndSR', $isOpenedURAndSR);
-jsVar('rawMethod', $app->rawMethod);
+$badgesOptions = array();
+$badgesOptions['mode'] = $mode;
+$badgesOptions['todoCount'] = $todoCount;
+$badgesOptions['isIPD'] = $isIPD;
+$badgesOptions['isMax'] = $isMax;
+$badgesOptions['isBiz'] = $isBiz;
+$badgesOptions['isOpenedURAndSR'] = $isOpenedURAndSR;
+$badgesOptions['rawMethod'] = $app->rawMethod;
+
+query('#featureBar')->append(on::init()->call('updateMainNavbarBadges', $badgesOptions));
diff --git a/module/my/ui/task.html.php b/module/my/ui/task.html.php
index 02377dcb63..157bac5005 100644
--- a/module/my/ui/task.html.php
+++ b/module/my/ui/task.html.php
@@ -32,7 +32,6 @@ $footToolbar = array('items' => array
$canBatchClose ? array('text' => $lang->close, 'className' => 'batch-btn ajax-btn', 'data-url' => helper::createLink('task', 'batchClose')) : null
), 'btnProps' => array('size' => 'sm', 'btnType' => 'secondary'));
-if($type == 'bySearch') $type = $this->session->myTaskType;
if($type == 'assignedTo') unset($config->my->task->dtable->fieldList['assignedTo']);
if($type == 'openedBy') unset($config->my->task->dtable->fieldList['openedBy']);
if($type == 'finishedBy') unset($config->my->task->dtable->fieldList['finishedBy']);
diff --git a/module/my/ui/todo.html.php b/module/my/ui/todo.html.php
index 0f6306a26b..46d5a1cee7 100644
--- a/module/my/ui/todo.html.php
+++ b/module/my/ui/todo.html.php
@@ -70,6 +70,9 @@ toolbar
setClass('btn primary'),
set::icon('plus'),
set::url(helper::createLink('todo', 'batchCreate')),
+ setData('toggle', 'modal'),
+ setData('size', 'lg'),
+ setData('class-name', 'batchCreateTodoModal'),
$lang->todo->batchCreate
),
$canCreate && $canBatchCreate ? dropdown
@@ -78,7 +81,7 @@ toolbar
set::items(array
(
array('text' => $lang->todo->create, 'url' => helper::createLink('todo', 'create'), 'data-toggle' => 'modal'),
- array('text' => $lang->todo->batchCreate, 'url' => helper::createLink('todo', 'batchCreate'), 'data-toggle' => 'modal', 'data-size' => 'lg')
+ array('text' => $lang->todo->batchCreate, 'url' => helper::createLink('todo', 'batchCreate'), 'data-toggle' => 'modal', 'data-size' => 'lg', 'data-class-name' => 'batchCreateTodoModal')
)),
set::placement('bottom-end')
) : null
diff --git a/module/personnel/css/addwhitelist.ui.css b/module/personnel/css/addwhitelist.ui.css
index 30a26251fd..f43fb1b66a 100644
--- a/module/personnel/css/addwhitelist.ui.css
+++ b/module/personnel/css/addwhitelist.ui.css
@@ -1,5 +1,6 @@
.add-whitelist-panel .panel-heading .select-dept-box, .add-whitelist-panel .select-object-box {display: inline-flex;}
.add-whitelist-panel .panel-heading .select-dept-box .picker, .add-whitelist-panel .select-object-box .picker {width: 248px;}
-.add-whitelist-panel form {width: 280px; min-width: unset;}
.add-whitelist-panel .panel-body .toolbar.form-actions {width: 280px; margin-top: 1.5rem;}
.add-whitelist-panel .form-batch-ditto-control .form-control {padding-right: 0.5rem;}
+.add-whitelist-panel .form-batch-table {width: 300px; min-width: unset;}
+.add-whitelist-panel .form-batch-container {max-height: calc(100vh - 280px)!important;}
diff --git a/module/product/js/browse.ui.js b/module/product/js/browse.ui.js
index 748ef8138b..b21a019315 100644
--- a/module/product/js/browse.ui.js
+++ b/module/product/js/browse.ui.js
@@ -37,6 +37,14 @@ $(document).off('click', '.batchUnlinkStory').on('click', '.batchUnlinkStory', f
const checkedList = dtable.$.getChecks();
if(!checkedList.length) return;
+ /* 处理选中的子需求的ID，截取-后的子需求ID。*/
+ /* Process selected child story ID. */
+ for(i in checkedList)
+ {
+ const storyID = checkedList[i];
+ if(storyID.includes('-')) checkedList[i] = storyID.slice(storyID.indexOf('-') + 1);
+ }
+
let batchUnlinkStoryURL = $.createLink('projectstory', 'batchUnlinkStory', 'projectID=' + projectID + '&stories=' + encodeURIComponent(checkedList.join(',')));
$.get(batchUnlinkStoryURL, function(data)
{
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index c6149aa899..5e99174ec8 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -327,8 +327,8 @@ featureBar
toolbar
(
- (!hasPriv('story', 'report') || !$productID) ? null : item(set(array('id' => 'reportBtn', 'text' => $lang->story->report->common, 'icon' => 'bar-chart', 'class' => 'ghost', 'url' => helper::createLink('story', 'report', "productID=$productID&branchID=$branch&storyType=$storyType&browseType=$browseType&moduleID=$moduleID&chartType=pie&projectID=$projectID") . ($app->tab == 'project' ? '#app=project' : '')))),
- !hasPriv('story', 'export') ? null : item(set(array('id' => 'exportBtn', 'text' => $lang->export, 'icon' => 'export', 'class' => 'ghost', 'url' => helper::createLink('story', 'export', "productID=$productID&orderBy=$orderBy&executionID=$projectID&browseType=$browseType&storyType=$storyType"), 'data-toggle' => 'modal'))),
+ (!hasPriv('story', 'report') || !$productID) ? null : item(set(array('id' => 'reportBtn', 'icon' => 'bar-chart', 'class' => 'ghost', 'url' => helper::createLink('story', 'report', "productID=$productID&branchID=$branch&storyType=$storyType&browseType=$browseType&moduleID=$moduleID&chartType=pie&projectID=$projectID") . ($app->tab == 'project' ? '#app=project' : '')))),
+ !hasPriv('story', 'export') ? null : item(set(array('id' => 'exportBtn', 'icon' => 'export', 'class' => 'ghost', 'url' => helper::createLink('story', 'export', "productID=$productID&orderBy=$orderBy&executionID=$projectID&browseType=$browseType&storyType=$storyType"), 'data-toggle' => 'modal'))),
$fnBuildCreateStoryButton(),
$fnBuildLinkStoryButton()
);
diff --git a/module/productplan/config/form.php b/module/productplan/config/form.php
index 5a702f7bf9..081af7a5fd 100644
--- a/module/productplan/config/form.php
+++ b/module/productplan/config/form.php
@@ -1,5 +1,5 @@
productplan->form = new stdclass();
$config->productplan->form->batchEdit = array();
$config->productplan->form->batchEdit['id'] = array('type' => 'int', 'control' => 'text', 'width' => '60px', 'name' => 'id', 'label' => $lang->idAB, 'required' => false, 'default' => 0, 'base' => true);
@@ -9,23 +9,20 @@ $config->productplan->form->batchEdit['status'] = array('type' => 'string', 'con
$config->productplan->form->batchEdit['begin'] = array('type' => 'date', 'control' => 'date', 'width' => '128px', 'name' => 'begin', 'label' => $lang->productplan->begin, 'required' => false, 'default' => '');
$config->productplan->form->batchEdit['end'] = array('type' => 'date', 'control' => 'date', 'width' => '128px', 'name' => 'end', 'label' => $lang->productplan->end, 'required' => false, 'default' => '');
-$now = helper::now();
-$config->productplan->form->create['parent'] = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->productplan->form->create['branch'] = array('type' => 'array', 'required' => false, 'default' => '0', 'filter' => 'join');
-$config->productplan->form->create['title'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->productplan->form->create['begin'] = array('type' => 'date', 'required' => false, 'default' => null);
-$config->productplan->form->create['end'] = array('type' => 'date', 'required' => false, 'default' => null);
-$config->productplan->form->create['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
-$config->productplan->form->create['product'] = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->productplan->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
-$config->productplan->form->create['createdDate'] = array('type' => 'datetime ', 'required' => false, 'default' => $now);
-$config->productplan->form->create['order'] = array('type' => 'string', 'required' => false, 'default' => 0);
+$config->productplan->form->create['parent'] = array('type' => 'int', 'required' => false, 'default' => 0);
+$config->productplan->form->create['branch'] = array('type' => 'array', 'required' => false, 'default' => '0', 'filter' => 'join');
+$config->productplan->form->create['title'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
+$config->productplan->form->create['begin'] = array('type' => 'date', 'required' => false, 'default' => null);
+$config->productplan->form->create['end'] = array('type' => 'date', 'required' => false, 'default' => null);
+$config->productplan->form->create['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
+$config->productplan->form->create['product'] = array('type' => 'int', 'required' => false, 'default' => 0);
+$config->productplan->form->create['order'] = array('type' => 'string', 'required' => false, 'default' => 0);
-$config->productplan->form->edit['parent'] = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->productplan->form->edit['branch'] = array('type' => 'array', 'required' => false, 'default' => '0', 'filter' => 'join');
-$config->productplan->form->edit['title'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->productplan->form->edit['begin'] = array('type' => 'date', 'required' => false, 'default' => null);
-$config->productplan->form->edit['end'] = array('type' => 'date', 'required' => false, 'default' => null);
-$config->productplan->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
-$config->productplan->form->edit['product'] = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->productplan->form->edit['status'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->productplan->form->edit['parent'] = array('type' => 'int', 'required' => false, 'default' => 0);
+$config->productplan->form->edit['branch'] = array('type' => 'array', 'required' => false, 'default' => '0', 'filter' => 'join');
+$config->productplan->form->edit['title'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
+$config->productplan->form->edit['begin'] = array('type' => 'date', 'required' => false, 'default' => null);
+$config->productplan->form->edit['end'] = array('type' => 'date', 'required' => false, 'default' => null);
+$config->productplan->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
+$config->productplan->form->edit['product'] = array('type' => 'int', 'required' => false, 'default' => 0);
+$config->productplan->form->edit['status'] = array('type' => 'string', 'required' => false, 'default' => '');
diff --git a/module/productplan/control.php b/module/productplan/control.php
index d22ffcfe05..c87d8b756e 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -69,7 +69,10 @@ class productplan extends control
{
if(!empty($_POST))
{
- $planData = form::data()->get();
+ $planData = form::data()
+ ->add('createdBy', $this->app->user->account)
+ ->add('createdDate', helper::now())
+ ->get();
$planID = $this->productplan->create($planData, (int)$this->post->future);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->loadModel('action')->create('productplan', $planID, 'opened');
diff --git a/module/program/js/kanban.ui.js b/module/program/js/kanban.ui.js
index 7c7bc9fa3b..be375d039f 100644
--- a/module/program/js/kanban.ui.js
+++ b/module/program/js/kanban.ui.js
@@ -20,7 +20,7 @@ window.getItem = function(info)
{
info.item.titleUrl = $.createLink('execution', 'task', `id=${info.item.id}`);
}
- else if(info.item.type == 'doingProjects' && privs.canViewProject)
+ else if(['waitingProjects', 'doingProjects'].includes(info.item.type) && privs.canViewProject)
{
info.item.titleUrl = $.createLink('project', 'index', `id=${info.item.id}`);
}
diff --git a/module/programplan/zen.php b/module/programplan/zen.php
index 0c44f09e6e..d6faad3713 100644
--- a/module/programplan/zen.php
+++ b/module/programplan/zen.php
@@ -89,6 +89,8 @@ class programplanZen extends programplan
if(!empty($this->config->setCode) && empty($plan->code) && strpos(",{$this->config->execution->create->requiredFields},", ',code,') !== false) dao::$errors["code[{$rowID}]"] = sprintf($this->lang->error->notempty, $plan->type == 'stage' ? $this->lang->execution->code : $this->lang->code);
}
+ if(strpos(",{$this->config->programplan->list->customCreateFields},", ',percent,') === false) $plan->percent = 0;
+
$totalPercent += $plan->percent;
$names[] = $plan->name;
if(!empty($plan->code)) $codes[] = $plan->code;
diff --git a/module/project/js/execution.ui.js b/module/project/js/execution.ui.js
index 5396805670..65bb82f909 100644
--- a/module/project/js/execution.ui.js
+++ b/module/project/js/execution.ui.js
@@ -45,7 +45,7 @@ window.onRenderCell = function(result, {col, row})
if(typeof executionType != 'undefined') executionName += `${executionType} `;
executionName += '';
- executionName += (!row.data.isParent) ? `
${row.data.name}` : row.data.name;
+ executionName += (executionType !== undefined && !row.data.isParent) ? `
${row.data.name}` : row.data.name;
executionName += '