Merge branch 'master' of https://github.com/easysoft/zentaopms

2019-05-29 11:23:19 +08:00
parent bd025b6bf3 8f0385a0c4
commit d0b6386ca7
14 changed files with 17 additions and 7 deletions
@@ -234,11 +234,11 @@ $lang->bug->typeList['security']     = 'Security';
 $lang->bug->typeList['performance']  = 'Performance';
 $lang->bug->typeList['standard']     = 'CodingConventions';
 $lang->bug->typeList['automation']   = 'TestScript';
-$lang->bug->typeList['others']       = 'Others';
 $lang->bug->typeList['designchange'] = 'DesignChange';
 $lang->bug->typeList['newfeature']   = 'NewFeature';
 $lang->bug->typeList['designdefect'] = 'DesignDefect';
 $lang->bug->typeList['trackthings']  = 'Tracking';
+$lang->bug->typeList['others']       = 'Other';

 $lang->bug->statusList['']         = '';
 $lang->bug->statusList['active']   = 'Active';
@@ -234,11 +234,11 @@ $lang->bug->typeList['security']     = '安全相关';
 $lang->bug->typeList['performance']  = '性能问题';
 $lang->bug->typeList['standard']     = '标准规范';
 $lang->bug->typeList['automation']   = '测试脚本';
-$lang->bug->typeList['others']       = '其他';
 $lang->bug->typeList['designchange'] = '设计变更';
 $lang->bug->typeList['newfeature']   = '新增需求';
 $lang->bug->typeList['designdefect'] = '设计缺陷';
 $lang->bug->typeList['trackthings']  = '事务跟踪';
+$lang->bug->typeList['others']       = '其他';

 $lang->bug->statusList['']         = '';
 $lang->bug->statusList['active']   = '激活';
@@ -65,6 +65,7 @@
        <tbody>
          <?php
          /* Remove the unused types. */
+          unset($lang->bug->typeList['interface']);
          unset($lang->bug->typeList['designchange']);
          unset($lang->bug->typeList['newfeature']);
          unset($lang->bug->typeList['trackthings']);
@@ -87,6 +87,7 @@
           * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task.
           * These thress types if upgrade from bugfree2.x.
           */
+          if($bug->type != 'interface')    unset($typeList['interface']);
          if($bug->type != 'designchange') unset($typeList['designchange']);
          if($bug->type != 'newfeature')   unset($typeList['newfeature']);
          if($bug->type != 'trackthings')  unset($typeList['trackthings']);
@@ -71,6 +71,7 @@ js::set('flow', $config->global->flow);
              <div class='input-group' id='bugTypeInputGroup'>
                <?php
                /* Remove the unused types. */
+                unset($lang->bug->typeList['interface']);
                unset($lang->bug->typeList['designchange']);
                unset($lang->bug->typeList['newfeature']);
                unset($lang->bug->typeList['trackthings']);
@@ -126,6 +127,7 @@ js::set('flow', $config->global->flow);
              <div class='input-group' id='bugTypeInputGroup'>
                <?php
                /* Remove the unused types. */
+                unset($lang->bug->typeList['interface']);
                unset($lang->bug->typeList['designchange']);
                unset($lang->bug->typeList['newfeature']);
                unset($lang->bug->typeList['trackthings']);
@@ -128,6 +128,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                     * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task.
                     * These thress types if upgrade from bugfree2.x.
                     */
+                    if($bug->type != 'interface')    unset($lang->bug->typeList['interface']);
                    if($bug->type != 'designchange') unset($lang->bug->typeList['designchange']);
                    if($bug->type != 'newfeature')   unset($lang->bug->typeList['newfeature']);
                    if($bug->type != 'trackthings')  unset($lang->bug->typeList['trackthings']);
@@ -43,6 +43,7 @@ class custom extends control

        if($module == 'bug' and $field == 'typeList')
        {
+            unset($fieldList['interface']);
            unset($fieldList['designchange']);
            unset($fieldList['newfeature']);
            unset($fieldList['trackthings']);
@@ -76,7 +76,7 @@ $lang->doc->manageType       = 'Manage Category';
 $lang->doc->editType         = 'Edit';
 $lang->doc->deleteType       = 'Delete';
 $lang->doc->addType          = 'Add';
-$lang->doc->childType        = 'Children';
+$lang->doc->childType        = 'Categories';
 $lang->doc->collect          = 'Add Favorite';
 $lang->doc->cancelCollection = 'Remove Favorite';
 $lang->doc->deleteFile       = 'Delete File';
@@ -5,3 +5,4 @@
 .block-release .panel-body {padding-bottom: 50px;}
 .block-release .panel-body > .btn.pull-right {position: absolute; right: 20px; bottom: 20px;}
 .col-4 .cell table td{word-wrap: break-word; word-break: normal;}
+.release-line li .title{  overflow:hidden; text-overflow:ellipsis; white-space:nowrap}
@@ -31,14 +31,14 @@
                <?php if(isset($plan->begin)):?>
                <li <?php if(date('Y-m-d') < $plan->begin) echo "class='active'";?>>
                  <a href="<?php echo $this->createLink('productplan', 'view', "planID={$plan->id}");?>">
-                    <span class="title"><?php echo $plan->title;?></span>
+                    <span class="title" title='<?php echo $plan->title;?>'><?php echo $plan->title;?></span>
                    <span class="date"><?php echo $plan->begin;?></span>
                  </a>
                </li>
                <?php else:?>
                <li>
                  <a href="<?php echo $this->createLink('release', 'view', "releaseID={$plan->id}");?>">
-                    <span class="title"><?php echo $plan->name;?></span>
+                    <span class="title" title='<?php echo $plan->name;?>'><?php echo $plan->name;?></span>
                    <span class="date"><?php echo $plan->date;?></span>
                  </a>
                </li>
@@ -310,7 +310,7 @@ $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
 $lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
 $lang->project->featureBar['task']['myinvolved']   = $lang->project->myInvolved;
 $lang->project->featureBar['task']['delayed']      = 'Delayed';
-$lang->project->featureBar['task']['needconfirm']  = 'StoryChanged';
+$lang->project->featureBar['task']['needconfirm']  = 'Changed';
 $lang->project->featureBar['task']['status']       = $lang->project->statusSelects[''];

 $lang->project->treeLevel = array();
@@ -84,7 +84,8 @@ js::set('browseType', $browseType);
            $label   = "<span class='text'>{$menuItem->text}</span>";
            $label  .= $menuType == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
            $active  = $menuType == $browseType ? 'btn-active-text' : '';
-            echo html::a(inlink('task', "project=$projectID&type=$menuType"), $label, '', "id='{$menuType}' class='btn btn-link $active'");
+            $title   = $menuType == 'needconfirm' ? "title='{$lang->task->storyChange}'" : '';
+            echo html::a(inlink('task', "project=$projectID&type=$menuType"), $label, '', "id='{$menuType}' class='btn btn-link $active' $title");
        }
        elseif($menuType == 'status')
        {
@@ -36,6 +36,7 @@ $lang->task->reportChart         = "Report Chart";
 $lang->task->fromBug             = 'From Bug';
 $lang->task->case                = 'Linked Case';
 $lang->task->confirmStoryChange  = "Confirm Change";
+$lang->task->storyChange         = "Story Changed";
 $lang->task->progress            = '%';
 $lang->task->progressTips        = 'Cost/(Cost+Left)';
 $lang->task->copy                = 'Copy Task';
@@ -36,6 +36,7 @@ $lang->task->reportChart         = "报表统计";
 $lang->task->fromBug             = '来源Bug';
 $lang->task->case                = '相关用例';
 $lang->task->confirmStoryChange  = "确认需求变动";
+$lang->task->storyChange         = "需求变更";
 $lang->task->progress            = '进度';
 $lang->task->progressTips        = '已消耗/(已消耗+剩余)';
 $lang->task->copy                = '复制任务';