diff --git a/config/zentaopms.php b/config/zentaopms.php index 974fc0f9c5..92b9eee1a2 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -256,6 +256,8 @@ define('TABLE_USERTPL', '`' . $config->db->prefix . 'usertpl`'); define('TABLE_ZAHOST', '`' . $config->db->prefix . 'host`'); define('TABLE_IMAGE', '`' . $config->db->prefix . 'image`'); +if(!defined('TABLE_ASSET')) define('TABLE_ASSET', '`' . $config->db->prefix . 'asset`'); + define('TABLE_PRODUCT', '`' . $config->db->prefix . 'product`'); define('TABLE_BRANCH', '`' . $config->db->prefix . 'branch`'); define('TABLE_EXPECT', '`' . $config->db->prefix . 'expect`'); diff --git a/module/repo/css/common.css b/module/repo/css/common.css index 417ef85a99..70ed35fa8a 100644 --- a/module/repo/css/common.css +++ b/module/repo/css/common.css @@ -235,6 +235,7 @@ h3 {font-size: 16px;} #relationTabs .nav-tabs >li > a .tab-nav-close {display: none;} #relationTabs .nav-tabs > li > a > i, #relationTabs .nav-tabs > li > a > span {background: #EDEEF2; font-weight: normal; padding: 1px 5px;} #relationTabs .nav-tabs > li.active > a > i, #relationTabs .nav-tabs > li.active > a > span {background: #E6F0FF; color: #2e7fff;} +.linkContent strong.text-primary {cursor: pointer;} #modules li {padding: 5px 0 0 15px;} .file-tree #modules .icon {color: #9EA3B0;} diff --git a/module/repo/js/common.js b/module/repo/js/common.js index 44140a19d8..972d8c3f7e 100644 --- a/module/repo/js/common.js +++ b/module/repo/js/common.js @@ -109,12 +109,16 @@ $(function() { $('#sidebar .side-body').load($(this).attr('data-href')); return false; - }).on('click', '#related .btn-close', function() + }).on('click', '#log .btn-close', function() { - $('#codeContainer').css('height', codeHeight); - $('#related').css('height', 0); $tabs = $('#relationTabs').data('zui.tabs'); if($tabs) $tabs.closeAll(); + $('.history').html(''); + $('#log').data('line', 0); + $('#log').hide(); + + $('#codeContainer').css('height', codeHeight); + $('#related').css('height', 0); }); if($("main").is(".hide-sidebar")) diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index 168f09ccf8..f0a50701ba 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -175,7 +175,7 @@ $lang->repo->notice->syncComplete = '同步完成,正在跳转...'; $lang->repo->notice->syncedCount = '已经同步记录条数'; $lang->repo->notice->delete = '是否要删除该代码库?'; $lang->repo->notice->successDelete = '已经成功删除代码库。'; -$lang->repo->notice->commentContent = '输入回复内容'; +$lang->repo->notice->commentContent = '输入评论内容'; $lang->repo->notice->deleteReview = '确认删除该评审?'; $lang->repo->notice->deleteBug = '确认删除该Bug?'; $lang->repo->notice->deleteComment = '确认删除该回复?'; diff --git a/module/repo/view/ajaxgetrelationinfo.html.php b/module/repo/view/ajaxgetrelationinfo.html.php index 0ca3eb10a0..aca0908413 100644 --- a/module/repo/view/ajaxgetrelationinfo.html.php +++ b/module/repo/view/ajaxgetrelationinfo.html.php @@ -10,6 +10,8 @@ ?> id); ?>
@@ -18,32 +20,61 @@ include '../../common/view/header.lite.html.php'; - + - - + + - + - - + + - - + + steps):?> - - + +
@@ -59,5 +90,12 @@ $(function() $(this).replaceWith(content); }) $('blockquote a').empty(); + + $('.linkContent strong.text-primary').on('click',function() + { + var link = createLink(objectType, 'view', objectType + 'ID=' + objectID); + var app = objectType == 'bug' ? 'qa' : (objectType == 'task' ? 'execution' : 'product'); + parent.parent.$.apps.open(link, app); + }); }); diff --git a/module/zahost/config.php b/module/zahost/config.php index 2b612315c3..934e0a3c96 100644 --- a/module/zahost/config.php +++ b/module/zahost/config.php @@ -48,3 +48,4 @@ $config->zahost->search['params']['editedDate'] = array('operator' => '=', $config->zahost->editor = new stdclass(); $config->zahost->editor->create = array('id' => 'desc', 'tools' => 'simpleTools'); $config->zahost->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools'); +