Merge branch 'master' into 'tianshujie_lang'
# Conflicts: # module/project/lang/de.php # module/project/lang/en.php # module/project/lang/fr.php
This commit is contained in:
孙广明
@@ -1427,7 +1427,6 @@ class project extends control
|
||||
$queryID = ($type == 'bysearch') ? (int)$param : 0;
|
||||
$actionURL = $this->createLink('project', 'build', "projectID=$projectID&type=bysearch&queryID=myQueryID");
|
||||
|
||||
$allExecutions = $this->loadModel('execution')->getByProject($projectID, 'all', '', true);
|
||||
$devel = $project->model == 'waterfall' ? true : false;
|
||||
$executions = $this->loadModel('execution')->getByProject($projectID, 'all', '', true, $devel);
|
||||
$this->config->build->search['fields']['execution'] = $this->project->lang->executionCommon;
|
||||
@@ -1488,8 +1487,7 @@ class project extends control
|
||||
$this->view->projectID = $projectID;
|
||||
$this->view->project = $project;
|
||||
$this->view->products = $products;
|
||||
$this->view->allExecutions = $allExecutions;
|
||||
$this->view->executions = $executions;
|
||||
$this->view->executions = $this->execution->getPairs();
|
||||
$this->view->buildPairs = $this->loadModel('build')->getBuildPairs(0);
|
||||
$this->view->type = $type;
|
||||
|
||||
|
||||
@@ -375,8 +375,8 @@ $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $e
|
||||
|
||||
$lang->project->multiple = "Multi {$lang->executionCommon}";
|
||||
|
||||
$lang->project->copyproject = new stdClass();
|
||||
$lang->project->copyproject->nameTips = '『Project Name』Cannot be repeated.';
|
||||
$lang->project->copyproject->codeTips = '『Project Code』Cannot be repeated.';
|
||||
$lang->project->copyproject->endTips = '『Schedule End』Cannot be empty.';
|
||||
$lang->project->copyproject->daysTips = '『Available working days』Should be numerical.';
|
||||
$lang->project->copyProject = new stdClass();
|
||||
$lang->project->copyProject->nameTips = '『Project Name』Cannot be repeated.';
|
||||
$lang->project->copyProject->codeTips = '『Project Code』Cannot be repeated.';
|
||||
$lang->project->copyProject->endTips = '『Schedule End』Cannot be empty.';
|
||||
$lang->project->copyProject->daysTips = '『Available working days』Should be numerical.';
|
||||
|
||||
@@ -375,8 +375,8 @@ $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $e
|
||||
|
||||
$lang->project->multiple = "Multi {$lang->executionCommon}";
|
||||
|
||||
$lang->project->copyproject = new stdClass();
|
||||
$lang->project->copyproject->nameTips = '『Project Name』Cannot be repeated.';
|
||||
$lang->project->copyproject->codeTips = '『Project Code』Cannot be repeated.';
|
||||
$lang->project->copyproject->endTips = '『Schedule End』Cannot be empty.';
|
||||
$lang->project->copyproject->daysTips = '『Available working days』Should be numerical.';
|
||||
$lang->project->copyProject = new stdClass();
|
||||
$lang->project->copyProject->nameTips = '『Project Name』Cannot be repeated.';
|
||||
$lang->project->copyProject->codeTips = '『Project Code』Cannot be repeated.';
|
||||
$lang->project->copyProject->endTips = '『Schedule End』Cannot be empty.';
|
||||
$lang->project->copyProject->daysTips = '『Available working days』Should be numerical.';
|
||||
|
||||
@@ -375,8 +375,8 @@ $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $e
|
||||
|
||||
$lang->project->multiple = "Multi {$lang->executionCommon}";
|
||||
|
||||
$lang->project->copyproject = new stdClass();
|
||||
$lang->project->copyproject->nameTips = '『Project Name』Cannot be repeated.';
|
||||
$lang->project->copyproject->codeTips = '『Project Code』Cannot be repeated.';
|
||||
$lang->project->copyproject->endTips = '『Schedule End』Cannot be empty.';
|
||||
$lang->project->copyproject->daysTips = '『Available working days』Should be numerical.';
|
||||
$lang->project->copyProject = new stdClass();
|
||||
$lang->project->copyProject->nameTips = '『Project Name』Cannot be repeated.';
|
||||
$lang->project->copyProject->codeTips = '『Project Code』Cannot be repeated.';
|
||||
$lang->project->copyProject->endTips = '『Schedule End』Cannot be empty.';
|
||||
$lang->project->copyProject->daysTips = '『Available working days』Should be numerical.';
|
||||
|
||||
@@ -375,8 +375,8 @@ $lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$
|
||||
|
||||
$lang->project->multiple = "启用{$lang->executionCommon}";
|
||||
|
||||
$lang->project->copyproject = new stdClass();
|
||||
$lang->project->copyproject->nameTips = '『项目名称』不可重复需要修改。';
|
||||
$lang->project->copyproject->codeTips = '『项目代号』不可重复需要修改。';
|
||||
$lang->project->copyproject->endTips = '『计划完成』不能为空。';
|
||||
$lang->project->copyproject->daysTips = '『可用工作日』应当是数字。';
|
||||
$lang->project->copyProject = new stdClass();
|
||||
$lang->project->copyProject->nameTips = '『项目名称』不可重复需要修改。';
|
||||
$lang->project->copyProject->codeTips = '『项目代号』不可重复需要修改。';
|
||||
$lang->project->copyProject->endTips = '『计划完成』不能为空。';
|
||||
$lang->project->copyProject->daysTips = '『可用工作日』应当是数字。';
|
||||
@@ -11,8 +11,6 @@
|
||||
*/
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php js::set('allExecutions', $allExecutions)?>
|
||||
<?php js::set('executions', $executions)?>
|
||||
<?php js::set('projectID', $projectID)?>
|
||||
<?php js::set('noDevStage', $lang->project->noDevStage)?>
|
||||
<?php js::set('createExecution', $lang->project->createExecution)?>
|
||||
@@ -50,15 +48,14 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="c-id-sm"><?php echo $lang->build->id;?></th>
|
||||
<th class="c-name text-left"><?php echo $lang->build->name;?></th>
|
||||
<th class="c-name w-250px text-left"><?php echo $lang->build->name;?></th>
|
||||
<?php if($project->hasProduct):?>
|
||||
<th class="c-name w-200px text-left"><?php echo $lang->build->product;?></th>
|
||||
<th class="c-name w-150px text-left"><?php echo $lang->build->product;?></th>
|
||||
<?php endif;?>
|
||||
<?php if($project->multiple):?>
|
||||
<th class="c-name text-left"><?php echo $lang->executionCommon;?></th>
|
||||
<th class="c-name w-150px text-left"><?php echo $lang->executionCommon;?></th>
|
||||
<?php endif;?>
|
||||
<th class="c-url"><?php echo $lang->build->scmPath;?></th>
|
||||
<th class="c-url"><?php echo $lang->build->filePath;?></th>
|
||||
<th class="c-url w-300px text-left"><?php echo $lang->build->url;?></th>
|
||||
<th class="c-date"><?php echo $lang->build->date;?></th>
|
||||
<th class="c-user"><?php echo $lang->build->builder;?></th>
|
||||
<th class="c-actions-5"><?php echo $lang->actions;?></th>
|
||||
@@ -71,11 +68,11 @@
|
||||
<tr data-id="<?php echo $productID;?>">
|
||||
<td class="c-id-sm text-muted"><?php echo html::a(helper::createLink($module, 'view', "buildID=$build->id"), sprintf('%03d', $build->id), '', "data-app='project'");?></td>
|
||||
<td class="c-name" title='<?php echo $build->name;?>'>
|
||||
<?php if(!$build->execution):?>
|
||||
<span class='icon icon-code-fork text-muted'></span>
|
||||
<?php endif;?>
|
||||
<?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
|
||||
<?php echo html::a($this->createLink($module, 'view', "buildID=$build->id"), $build->name, '', "data-app='project'");?>
|
||||
<?php if(!$build->execution):?>
|
||||
<span class='icon icon-code-fork text-muted' title='<?php echo $lang->build->integrated;?>'></span>
|
||||
<?php endif;?>
|
||||
</td>
|
||||
<?php if($project->hasProduct):?>
|
||||
<td class="c-name text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>
|
||||
@@ -91,7 +88,7 @@
|
||||
<?php endforeach;?>
|
||||
|
||||
<?php foreach($childExecutions as $execution):?>
|
||||
<?php $executionName = zget($allExecutions, $execution, '');?>
|
||||
<?php $executionName = zget($executions, $execution, '');?>
|
||||
<?php if($executionName):?>
|
||||
<span title="<?php echo $executionName;?>"><?php echo $executionName;?></span></br>
|
||||
<?php endif;?>
|
||||
@@ -99,8 +96,12 @@
|
||||
</td>
|
||||
<?php endif;?>
|
||||
<?php endif;?>
|
||||
<td class="c-url" title="<?php echo $build->scmPath?>"><?php echo strpos($build->scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?></td>
|
||||
<td class="c-url" title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
|
||||
<td class="c-url text-left">
|
||||
<?php
|
||||
if($build->scmPath) echo "<div><i class='icon icon-code' title='{$lang->build->scmPath}'></i> <span title='{$build->scmPath}'>" . (strpos($build->scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath) . '</span></div>';
|
||||
if($build->filePath) echo "<div><i class='icon icon-file-archive' title='{$lang->build->filePath}'></i> <span title='{$build->filePath}'>" . (strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath) . '</span></div>';
|
||||
?>
|
||||
</td>
|
||||
<td class="c-date"><?php echo $build->date?></td>
|
||||
<td class="c-user em"><?php echo zget($users, $build->builder);?></td>
|
||||
<td class="c-actions"><?php echo $this->build->buildOperateMenu($build, 'browse');?></td>
|
||||
|
||||
@@ -36,10 +36,10 @@
|
||||
<?php $requiredFields = $config->project->create->requiredFields;?>
|
||||
<?php js::set('requiredFields', $requiredFields);?>
|
||||
<?php js::set('copyType', '');?>
|
||||
<?php js::set('nameTips', $lang->project->copyproject->nameTips);?>
|
||||
<?php js::set('codeTips', $lang->project->copyproject->codeTips);?>
|
||||
<?php js::set('endTips', $lang->project->copyproject->endTips);?>
|
||||
<?php js::set('daysTips', $lang->project->copyproject->daysTips);?>
|
||||
<?php js::set('nameTips', $lang->project->copyProject->nameTips);?>
|
||||
<?php js::set('codeTips', $lang->project->copyProject->codeTips);?>
|
||||
<?php js::set('endTips', $lang->project->copyProject->endTips);?>
|
||||
<?php js::set('daysTips', $lang->project->copyProject->daysTips);?>
|
||||
<div id='mainContent' class='main-content'>
|
||||
<div class='center-block'>
|
||||
<div class='main-header'>
|
||||
|
||||
Reference in New Issue
Block a user