Merge branch 'zenops_46' into zenops_46_tanghucheng

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`');

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;}

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"))

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  = '确认删除该回复？';

module/repo/view/ajaxgetrelationinfo.html.php

@@ -10,6 +10,8 @@
 ?>
 <?php
 include '../../common/view/header.lite.html.php';
+js::set('objectType', $objectType);
+js::set('objectID', $object->id);
 ?>
 <div class="main-col linkContent main">
   <div class="content pane">
@@ -18,32 +20,61 @@ include '../../common/view/header.lite.html.php';
         <table class="menu-title">
           <?php if($objectType == 'story'):?>
           <tr>
-            <td class="text text-primary"><strong><?php echo $object->title; ?></strong></td>
+            <td class="text">
+              <span class="detail-title"><?php echo $lang->story->title;?></span>
+              <strong class='text-primary'><?php echo $object->title;?></strong>
+            </td>
             <td></td>
           </tr>
           <tr>
-            <td class="text"><div class="spec-content detail-content article-content"><?php echo $object->spec; ?></div></td>
-            <td class="text right-content"><div class="detail-content article-content"><?php echo $object->verify; ?></div></td>
+            <td class="text">
+              <div class="spec-content detail-content article-content">
+                <span class="strong detail-title"><?php echo $lang->story->spec;?></span><?php echo $object->spec; ?>
+              </div>
+            </td>
+            <td class="text right-content">
+              <div class="detail-content article-content">
+                <span class="strong detail-title"><?php echo $lang->story->verify;?></span><?php echo $object->verify; ?>
+              </div>
+            </td>
           </tr>
           <?php elseif($objectType == 'task'):?>
           <tr>
-            <td class="text text-primary"><strong><?php echo $object->name; ?></strong></td>
+            <td class="text">
+              <span class="detail-title"><?php echo $lang->task->name;?></span>
+              <strong class='text-primary'><?php echo $object->name;?></strong>
+            </td>
             <td></td>
           </tr>
           <tr>
-            <td class="text"><div class="spec-content detail-content article-content"><?php echo $object->desc; ?></div></td>
-            <td class="text right-content"><div class="detail-content article-content"><?php echo $object->storyTitle; ?></div></td>
+            <td class="text">
+              <div class="spec-content detail-content article-content">
+                <div class="strong detail-title"><?php echo $lang->task->desc;?></div><?php echo $object->desc; ?>
+              </div>
+            </td>
+            <td class="text right-content">
+              <div class="detail-content article-content">
+                <div class="strong detail-title"><?php echo $lang->task->story;?></div><?php echo $object->storyTitle; ?>
+              </div>
+            </td>
           </tr>
           <?php elseif($objectType == 'bug'):?>
           <tr>
-            <td class="text text-primary"><strong><?php echo $object->title; ?></strong></td>
-            <td></td>
+            <td class="text">
+              <span class="detail-title"><?php echo $lang->bug->title;?></span>
+              <strong class='text-primary' data-id='<?php echo $object->id;?>'><?php echo $object->title;?></strong>
+            </td>
           </tr>
+          <?php if($object->steps):?>
           <tr>
-            <td class="text"><div class="spec-content detail-content article-content"><?php echo $object->steps; ?></div></td>
-            <td class="text right-content"><div class="detail-content article-content"><?php echo zget($lang->bug->typeList, $object->type);?></div></td>
+            <td class="text">
+              <div class="spec-content detail-content article-content">
+                <span class="strong detail-title"><?php echo $lang->bug->steps;?></span><?php echo $object->steps; ?>
+              </div>
+            </td>
           </tr>
           <?php endif;?>
+          <?php endif;?>
         </table>
       </div>
     </div>
@@ -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);
+    });
 });
 </script>

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');
+