diff --git a/db/zentao.sql b/db/zentao.sql index 153fa03752..95ef0d351b 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1178,7 +1178,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'project', 'bug'), (1, 'project', 'build'), (1, 'project', 'burn'), -(1, 'project', 'burnData'), (1, 'project', 'close'), (1, 'project', 'computeBurn'), (1, 'project', 'create'), @@ -1475,7 +1474,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'project', 'bug'), (2, 'project', 'build'), (2, 'project', 'burn'), -(2, 'project', 'burnData'), (2, 'project', 'computeBurn'), (2, 'project', 'doc'), (2, 'project', 'dynamic'), @@ -1663,7 +1661,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3, 'project', 'bug'), (3, 'project', 'build'), (3, 'project', 'burn'), -(3, 'project', 'burnData'), (3, 'project', 'computeBurn'), (3, 'project', 'doc'), (3, 'project', 'dynamic'), @@ -1912,7 +1909,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'project', 'bug'), (4, 'project', 'build'), (4, 'project', 'burn'), -(4, 'project', 'burnData'), (4, 'project', 'close'), (4, 'project', 'computeBurn'), (4, 'project', 'create'), @@ -2161,7 +2157,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'project', 'bug'), (5, 'project', 'build'), (5, 'project', 'burn'), -(5, 'project', 'burnData'), (5, 'project', 'close'), (5, 'project', 'computeBurn'), (5, 'project', 'create'), @@ -2418,7 +2413,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'project', 'bug'), (6, 'project', 'build'), (6, 'project', 'burn'), -(6, 'project', 'burnData'), (6, 'project', 'close'), (6, 'project', 'computeBurn'), (6, 'project', 'create'), @@ -2662,7 +2656,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'project', 'bug'), (7, 'project', 'build'), (7, 'project', 'burn'), -(7, 'project', 'burnData'), (7, 'project', 'doc'), (7, 'project', 'dynamic'), (7, 'project', 'grouptask'), @@ -2896,7 +2889,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'project', 'bug'), (8, 'project', 'build'), (8, 'project', 'burn'), -(8, 'project', 'burnData'), (8, 'project', 'doc'), (8, 'project', 'dynamic'), (8, 'project', 'grouptask'), @@ -3139,7 +3131,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'project', 'bug'), (9, 'project', 'build'), (9, 'project', 'burn'), -(9, 'project', 'burnData'), (9, 'project', 'computeBurn'), (9, 'project', 'doc'), (9, 'project', 'dynamic'), diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index 3df53b0118..9d73e73cb5 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -102,6 +102,7 @@ $lang->dev->groupList['product'] = $lang->productCommon; $lang->dev->groupList['project'] = $lang->projectCommon; $lang->dev->groupList['qa'] = 'QA'; $lang->dev->groupList['doc'] = 'Doc'; +$lang->dev->groupList['report'] = 'Report'; $lang->dev->groupList['company'] = 'Company'; $lang->dev->groupList['repo'] = 'Code'; $lang->dev->groupList['api'] = 'API'; diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php index 1c9a3bc208..440d33a1d0 100644 --- a/module/dev/lang/zh-cn.php +++ b/module/dev/lang/zh-cn.php @@ -102,6 +102,7 @@ $lang->dev->groupList['product'] = $lang->productCommon; $lang->dev->groupList['project'] = $lang->projectCommon; $lang->dev->groupList['qa'] = '测试'; $lang->dev->groupList['doc'] = '文档'; +$lang->dev->groupList['report'] = '统计'; $lang->dev->groupList['company'] = '组织'; $lang->dev->groupList['repo'] = '代码'; $lang->dev->groupList['api'] = 'API'; diff --git a/module/doc/css/view.css b/module/doc/css/view.css index ca8815a326..c4ea111eca 100644 --- a/module/doc/css/view.css +++ b/module/doc/css/view.css @@ -19,4 +19,3 @@ .doc-fullscreen .main-row > .side-col {width: 0; position: relative; overflow: hidden} .doc-fullscreen .main-row > .side-col > .cell {opacity: 0} .doc-fullscreen .fullscreen-btn > .icon-fullscreen:before {content: '\e972'} -.doc-fullscreen .main-row > .main-col .article-content {max-width: 1360px;} diff --git a/module/doc/js/view.js b/module/doc/js/view.js index 32336dd778..5690153a5c 100644 --- a/module/doc/js/view.js +++ b/module/doc/js/view.js @@ -1,6 +1,11 @@ $(function() { - $('#urlIframe').height($('#mainContent').height() - 35); + if($('#urlIframe').size() > 0) + { + var defaultHeight = $.cookie('windowHeight') - $('#header').height() - $('#footer').height() - $('#mainMenu').height() - 50; + $('#urlIframe').height(defaultHeight); + setTimeout($.resetToolbarPosition, 50); + } $('body').addClass('doc-fullscreen'); $('#mainContent .fullscreen-btn').click(function() { diff --git a/module/product/model.php b/module/product/model.php index b7bc37e5ca..c971f6294f 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -317,6 +317,7 @@ class productModel extends model ->leftJoin(TABLE_PRODUCT)->alias('t2') ->on('t1.product = t2.id') ->where('t1.project')->eq($projectID) + ->andWhere('t2.deleted')->eq(0) ->orderBy('t2.order desc') ->fetchPairs(); } diff --git a/module/project/css/create.css b/module/project/css/create.css index 19ffde3d18..c0801119c1 100644 --- a/module/project/css/create.css +++ b/module/project/css/create.css @@ -1,4 +1,5 @@ #tipsModal {margin-top: 10%;} +.chosen-container-single .chosen-single > span{max-width:100%;} #copyProjectModal {padding: 0} #copyProjectModal {padding: 0 2px}