* Finish task #45153.
This commit is contained in:
孙广明
@@ -341,7 +341,7 @@ class upgrade extends control
|
||||
/* When upgrading historical data as a project, handle products that are not linked with the project. */
|
||||
if(!empty($singleProducts)) $this->upgrade->computeProductAcl($singleProducts, $programID);
|
||||
}
|
||||
elseif($type == 'sprint' or $type == 'noProject')
|
||||
elseif($type == 'sprint' or $type == 'noProject' or $type == 'moreLink')
|
||||
{
|
||||
$linkedSprints = $this->post->sprints;
|
||||
|
||||
@@ -369,16 +369,6 @@ class upgrade extends control
|
||||
}
|
||||
}
|
||||
}
|
||||
elseif($type == 'moreLink')
|
||||
{
|
||||
foreach($this->post->projects as $i => $projectID)
|
||||
{
|
||||
$sprintID = $this->post->sprints[$i];
|
||||
|
||||
/* Change program field for product and project. */
|
||||
$this->upgrade->processMergedData(0, $projectID, 0, array(), array($sprintID));
|
||||
}
|
||||
}
|
||||
|
||||
die(js::locate($this->createLink('upgrade', 'mergeProgram', "type=$type&programID=$programID&projectType=$projectType"), 'parent'));
|
||||
}
|
||||
|
||||
@@ -118,7 +118,8 @@ $lang->upgrade->mergeSummary = "Dear users, there are %s {$lang->productCo
|
||||
$lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED {$lang->projectCommon}: Consolidate the entire {$lang->productCommon} line and the {$lang->productCommon} and {$lang->projectCommon} below it into one large project.";
|
||||
$lang->upgrade->mergeByProduct = "PRODUCT-BASED {$lang->projectCommon}: You can select multiple {$lang->productCommon} and their lower {$lang->projectCommon} to merge into a large project, or you can select a {$lang->productCommon} to merge its lower {$lang->projectCommon} into a larger project";
|
||||
$lang->upgrade->mergeByProject = "Independent {$lang->projectCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently";
|
||||
$lang->upgrade->mergeByMoreLink = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: select which project the {$lang->projectCommon} belongs to.";
|
||||
$lang->upgrade->needCreateProject = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: No projects in ZenTao. Upgrade the historical {$lang->projectCommon} as a project, or create a new project.";
|
||||
$lang->upgrade->mergeByMoreLink = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently.";
|
||||
$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product.";
|
||||
$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrad. Please create an index.';
|
||||
$lang->upgrade->errorEngineInnodb = 'Your MySQL version is too low to support InnoDB data table engine. Please modify it to MyISAM and try again.';
|
||||
|
||||
@@ -120,7 +120,8 @@ $lang->upgrade->mergeSummary = "Dear users, there are %s {$lang->productCo
|
||||
$lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED {$lang->projectCommon}: Consolidate the entire {$lang->productCommon} line and the {$lang->productCommon} and {$lang->projectCommon} below it into one large project.";
|
||||
$lang->upgrade->mergeByProduct = "PRODUCT-BASED {$lang->projectCommon}: You can select multiple {$lang->productCommon} and their lower {$lang->projectCommon} to merge into a large project, or you can select a {$lang->productCommon} to merge its lower {$lang->projectCommon} into a larger project";
|
||||
$lang->upgrade->mergeByProject = "Independent {$lang->projectCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently";
|
||||
$lang->upgrade->mergeByMoreLink = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: select which project the {$lang->projectCommon} belongs to.";
|
||||
$lang->upgrade->needCreateProject = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: No projects in ZenTao. Upgrade the historical {$lang->projectCommon} as a project, or create a new project.";
|
||||
$lang->upgrade->mergeByMoreLink = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently.";
|
||||
$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product.";
|
||||
$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.';
|
||||
$lang->upgrade->errorEngineInnodb = 'Your MySQL does not support InnoDB data table engine. Please modify it to MyISAM and try again.';
|
||||
|
||||
@@ -120,7 +120,8 @@ $lang->upgrade->mergeSummary = "Dear users, there are %s {$lang->productCo
|
||||
$lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED {$lang->projectCommon}: Consolidate the entire {$lang->productCommon} line and the {$lang->productCommon} and {$lang->projectCommon} below it into one large project.";
|
||||
$lang->upgrade->mergeByProduct = "PRODUCT-BASED {$lang->projectCommon}: You can select multiple {$lang->productCommon} and their lower {$lang->projectCommon} to merge into a large project, or you can select a {$lang->productCommon} to merge its lower {$lang->projectCommon} into a larger project";
|
||||
$lang->upgrade->mergeByProject = "Independent {$lang->projectCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently";
|
||||
$lang->upgrade->mergeByMoreLink = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: select which project the {$lang->projectCommon} belongs to.";
|
||||
$lang->upgrade->needCreateProject = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: No projects in ZenTao. Upgrade the historical {$lang->projectCommon} as a project, or create a new project.";
|
||||
$lang->upgrade->mergeByMoreLink = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently.";
|
||||
$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product.";
|
||||
$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.';
|
||||
$lang->upgrade->errorEngineInnodb = 'Your MySQL does not support InnoDB data table engine. Please modify it to MyISAM and try again.';
|
||||
|
||||
@@ -120,7 +120,8 @@ $lang->upgrade->mergeSummary = "Dear users, there are %s {$lang->productCo
|
||||
$lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED {$lang->projectCommon}: Consolidate the entire {$lang->productCommon} line and the {$lang->productCommon} and {$lang->projectCommon} below it into one large project.";
|
||||
$lang->upgrade->mergeByProduct = "PRODUCT-BASED {$lang->projectCommon}: You can select multiple {$lang->productCommon} and their lower {$lang->projectCommon} to merge into a large project, or you can select a {$lang->productCommon} to merge its lower {$lang->projectCommon} into a larger project";
|
||||
$lang->upgrade->mergeByProject = "Independent {$lang->projectCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently";
|
||||
$lang->upgrade->mergeByMoreLink = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: select which project the {$lang->projectCommon} belongs to.";
|
||||
$lang->upgrade->needCreateProject = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: No projects in ZenTao. Upgrade the historical {$lang->projectCommon} as a project, or create a new project.";
|
||||
$lang->upgrade->mergeByMoreLink = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: You can select several {$lang->projectCommon} and merge them into one large project, or merge them independently.";
|
||||
$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product.";
|
||||
$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.';
|
||||
$lang->upgrade->errorEngineInnodb = 'Your MySQL version is too low to support InnoDB data table engine. Please modify it to MyISAM and try again.';
|
||||
|
||||
@@ -120,7 +120,8 @@ $lang->upgrade->mergeSummary = "尊敬的用户，您的系统中共有%s
|
||||
$lang->upgrade->mergeByProductLine = "以{$lang->productCommon}线组织的{$lang->productCommon}和{$lang->projectCommon}：将整个{$lang->productCommon}线及其下面的{$lang->productCommon}和{$lang->projectCommon}归并到一个项目集和项目中，也可以分开归并。";
|
||||
$lang->upgrade->mergeByProduct = "以{$lang->productCommon}组织的{$lang->projectCommon}：可以选择多个{$lang->productCommon}及其下面的{$lang->projectCommon}归并到一个项目集和项目中，也可以选择某一个{$lang->productCommon}将其下面所属的{$lang->projectCommon}归并到项目集和项目中。";
|
||||
$lang->upgrade->mergeByProject = "独立的{$lang->projectCommon}：可以选择若干{$lang->projectCommon}归并到一个项目中，也可以独立归并。";
|
||||
$lang->upgrade->mergeByMoreLink = "关联多个{$lang->productCommon}的{$lang->projectCommon}：选择这个{$lang->projectCommon}归属于哪一个项目。";
|
||||
$lang->upgrade->needCreateProject = "关联多个{$lang->productCommon}的{$lang->projectCommon}：目前系统中没有项目，请把历史的{$lang->projectCommon}作为项目升级，或新建项目。";
|
||||
$lang->upgrade->mergeByMoreLink = "关联多个{$lang->productCommon}的{$lang->projectCommon}：选择一个或多个{$lang->projectCommon}归并到一个项目集和项目中。";
|
||||
$lang->upgrade->mergeRepoTips = "将选中的版本库归并到所选产品下。";
|
||||
$lang->upgrade->needBuild4Add = '本次升级需要创建索引。请到 [后台->系统->重建索引] 页面，重新创建索引。';
|
||||
$lang->upgrade->errorEngineInnodb = '您当前的数据库不支持使用InnoDB数据表引擎，请修改为MyISAM后重试。';
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
<div class='alert alert-info'>
|
||||
<?php
|
||||
printf($lang->upgrade->mergeSummary, $noMergedProductCount, $noMergedSprintCount);
|
||||
if($type == 'moreLink') echo '<br />' . $lang->upgrade->mergeByProject;
|
||||
if($type == 'sprint') echo '<br />' . $lang->upgrade->mergeByProject;
|
||||
if($type == 'noProject') echo '<br />' . $lang->upgrade->needCreateProject;
|
||||
if($type == 'moreLink') echo '<br />' . $lang->upgrade->mergeByMoreLink;
|
||||
?>
|
||||
</div>
|
||||
<div class='main-row'>
|
||||
|
||||
@@ -24,38 +24,8 @@
|
||||
<?php include './mergebyline.html.php';?>
|
||||
<?php elseif($type == 'product'):?>
|
||||
<?php include './mergebyproduct.html.php';?>
|
||||
<?php elseif($type == 'sprint' or $type == 'noProject'):?>
|
||||
<?php elseif($type == 'sprint' or $type == 'noProject' or $type == 'moreLink'):?>
|
||||
<?php include './mergebysprint.html.php';?>
|
||||
<?php elseif($type == 'moreLink'):?>
|
||||
<div class='alert alert-info'>
|
||||
<?php
|
||||
printf($lang->upgrade->mergeSummary, $noMergedProductCount, $noMergedSprintCount);
|
||||
echo '<br />' . $lang->upgrade->mergeByMoreLink;
|
||||
?>
|
||||
</div>
|
||||
<table class='table table-hover table-form'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th><?php echo $lang->projectCommon;?></th>
|
||||
<th class='divider'></th>
|
||||
<th class='w-p50'><?php echo $lang->upgrade->selectProject;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($noMergedSprints as $sprintID => $sprint):?>
|
||||
<tr>
|
||||
<td><?php echo "{$sprint->name}" . html::hidden("sprints[]", $sprint->id);?></td>
|
||||
<td class='divider'><i class='icon icon-angle-double-right'></i></td>
|
||||
<td><?php echo html::select("projects[]", $sprint->projects, '', "class='form-control chosen'");?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td class='text-center' colspan='3'><?php echo html::submitButton();?></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user