Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
modify install view and finish task #69698#69703#69704#69705#69701 See merge request easycorp/zentaopms!5416
This commit is contained in:
王怡栋
+1
-1
@@ -1 +1 @@
|
||||
ALTER table `zt_project` ADD `noExecution` enum('0', '1') NOT NULL DEFAULT '0';
|
||||
ALTER table `zt_project` ADD `noSprint` enum('0', '1') NOT NULL DEFAULT '0';
|
||||
|
||||
@@ -235,8 +235,8 @@ $lang->custom->weekendList[2] = '2-Day Off';
|
||||
$lang->custom->weekendList[1] = '1-Day Off';
|
||||
|
||||
global $config;
|
||||
$lang->custom->sprintConceptList[0] = 'Product - Project';
|
||||
$lang->custom->sprintConceptList[1] = 'Product - Iteration';
|
||||
$lang->custom->sprintConceptList[0] = 'Program Product Iteration';
|
||||
$lang->custom->sprintConceptList[1] = 'Program Product Sprint';
|
||||
|
||||
$lang->custom->workingList['full'] = 'Full Management of Dev';
|
||||
|
||||
|
||||
@@ -235,8 +235,8 @@ $lang->custom->weekendList[2] = '2-Day Off';
|
||||
$lang->custom->weekendList[1] = '1-Day Off';
|
||||
|
||||
global $config;
|
||||
$lang->custom->sprintConceptList[0] = 'Program - Product - Iteration';
|
||||
$lang->custom->sprintConceptList[1] = 'Program - Product - Sprint';
|
||||
$lang->custom->sprintConceptList[0] = 'Program Product Iteration';
|
||||
$lang->custom->sprintConceptList[1] = 'Program Product Sprint';
|
||||
|
||||
$lang->custom->workingList['full'] = 'Application Lifecycle Management';
|
||||
|
||||
|
||||
@@ -235,8 +235,8 @@ $lang->custom->weekendList[2] = '2-Jour';
|
||||
$lang->custom->weekendList[1] = '1-Jour';
|
||||
|
||||
global $config;
|
||||
$lang->custom->sprintConceptList[0] = 'Product - Project';
|
||||
$lang->custom->sprintConceptList[1] = 'Product - Iteration';
|
||||
$lang->custom->sprintConceptList[0] = 'Program Product Iteration';
|
||||
$lang->custom->sprintConceptList[1] = 'Program Product Sprint';
|
||||
|
||||
$lang->custom->workingList['full'] = 'Application Lifecycle Management';
|
||||
|
||||
|
||||
@@ -235,8 +235,8 @@ $lang->custom->weekendList[2] = '双休';
|
||||
$lang->custom->weekendList[1] = '单休';
|
||||
|
||||
global $config;
|
||||
$lang->custom->sprintConceptList[0] = '项目 - 产品 - 迭代';
|
||||
$lang->custom->sprintConceptList[1] = '项目 - 产品 - 冲刺';
|
||||
$lang->custom->sprintConceptList[0] = '项目 产品 迭代';
|
||||
$lang->custom->sprintConceptList[1] = '项目 产品 冲刺';
|
||||
|
||||
$lang->custom->workingList['full'] = '完整研发管理工具';
|
||||
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
.panel {width: 1200px; margin: auto; padding: 0px 40px 40px 40px;}
|
||||
.panel h1 {margin-top: 20px; margin-bottom: 20px;}
|
||||
.panel .icon {font-size: 20px;}
|
||||
|
||||
#mainContent tr td .icon-close {font-weight: bold; color: #ea644a;}
|
||||
#mainContent tr td .icon-check {font-weight: bold; color: #329d38;}
|
||||
|
||||
@@ -7,4 +11,4 @@
|
||||
#useLean {background-color: #ddd!important; padding: 6px 85px;}
|
||||
#useNew {background-color: #ddd!important; padding: 6px 85px;}
|
||||
|
||||
#mainContent .datatable {cursor: default;}
|
||||
#mainContent .datatable {cursor: default;}
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<?php else:?>
|
||||
<div class='panel' style='padding:50px 280px'>
|
||||
<div class='panel'>
|
||||
<form method='post'>
|
||||
<h1 class='text-center'><?php echo $title;?></h1>
|
||||
<div class='main-row' id='mainContent'>
|
||||
|
||||
@@ -257,6 +257,9 @@ $lang->project->featureBar['build']['all'] = 'Build List';
|
||||
$lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
|
||||
$lang->project->aclList['open'] = "Open (accessible with project view permissions)";
|
||||
|
||||
$lang->project->noSprintList['0'] = "Disable";
|
||||
$lang->project->noSprintList['1'] = "Enable";
|
||||
|
||||
$lang->project->acls['private'] = 'Private';
|
||||
$lang->project->acls['open'] = "Open";
|
||||
|
||||
@@ -334,4 +337,6 @@ $lang->project->childLongTime = "If a child as long-term projects, the pa
|
||||
$lang->project->confirmUnlinkMember = "Do you want to remove this user from project?";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
|
||||
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
|
||||
|
||||
$lang->project->noSprint = 'No sprint';
|
||||
|
||||
@@ -257,6 +257,9 @@ $lang->project->featureBar['build']['all'] = 'Build List';
|
||||
$lang->project->aclList['private'] = 'Private (For the project leader, team members and stakeholders only)';
|
||||
$lang->project->aclList['open'] = "Open (accessible with project view permissions)";
|
||||
|
||||
$lang->project->noSprintList['0'] = "Disable";
|
||||
$lang->project->noSprintList['1'] = "Enable";
|
||||
|
||||
$lang->project->acls['private'] = 'Private';
|
||||
$lang->project->acls['open'] = 'Open';
|
||||
|
||||
@@ -334,4 +337,6 @@ $lang->project->childLongTime = "There are long-term projects in the child
|
||||
$lang->project->confirmUnlinkMember = "Do you want to remove this user from project?";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
|
||||
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
|
||||
|
||||
$lang->project->noSprint = 'No sprint';
|
||||
|
||||
@@ -257,6 +257,9 @@ $lang->project->featureBar['build']['all'] = 'Build List';
|
||||
$lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
|
||||
$lang->project->aclList['open'] = "Open (accessible with project view permissions)";
|
||||
|
||||
$lang->project->noSprintList['0'] = "Disable";
|
||||
$lang->project->noSprintList['1'] = "Enable";
|
||||
|
||||
$lang->project->acls['private'] = 'Private';
|
||||
$lang->project->acls['open'] = "Open";
|
||||
|
||||
@@ -334,4 +337,6 @@ $lang->project->childLongTime = "If a child as long-term projects, the pa
|
||||
$lang->project->confirmUnlinkMember = "Do you want to remove this user from project?";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
|
||||
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
|
||||
|
||||
$lang->project->noSprint = 'No sprint';
|
||||
|
||||
@@ -257,6 +257,9 @@ $lang->project->featureBar['build']['all'] = '所有版本';
|
||||
$lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)";
|
||||
$lang->project->aclList['open'] = "公开 (有项目视图权限即可访问)";
|
||||
|
||||
$lang->project->noSprintList['0'] = "不启用";
|
||||
$lang->project->noSprintList['1'] = "启用";
|
||||
|
||||
$lang->project->acls['private'] = '私有';
|
||||
$lang->project->acls['open'] = '公开';
|
||||
|
||||
@@ -334,4 +337,6 @@ $lang->project->childLongTime = "子项目中有长期项目，父项目
|
||||
$lang->project->confirmUnlinkMember = "您确定从该项目中移除该用户吗？";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
|
||||
$lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
|
||||
|
||||
$lang->project->noSprint = '是否启用迭代';
|
||||
|
||||
@@ -73,6 +73,12 @@
|
||||
<td><?php echo html::input('code', $code, "class='form-control' required");?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<?php if($model == 'scrum' or $model == 'kanban'):?>
|
||||
<tr>
|
||||
<th><?php echo $lang->project->noSprint;?></th>
|
||||
<td colspan='3'><?php echo nl2br(html::radio('noSprint', $lang->project->noSprintList, 1));?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th><?php echo $lang->project->PM;?></th>
|
||||
<td><?php echo html::select('PM', $pmUsers, '', "class='form-control chosen'" . (strpos($requiredFields, 'PM') !== false ? ' required' : ''));?></td>
|
||||
|
||||
@@ -77,6 +77,12 @@
|
||||
<td><?php echo html::input('code', $project->code, "class='form-control' required");?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<?php if($model == 'scrum' or $model == 'kanban'): ?>
|
||||
<tr>
|
||||
<th><?php echo $lang->project->noSprint;?></th>
|
||||
<td colspan='3'><?php echo nl2br(html::radio('noSprint', $lang->project->noSprintList, $project->noSprint, 'disabled'));?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th><?php echo $lang->project->PM;?></th>
|
||||
<td><?php echo html::select('PM', $PMUsers, $project->PM, "class='form-control chosen'" . (strpos($requiredFields, 'PM') !== false ? ' required' : ''));?></td>
|
||||
|
||||
Reference in New Issue
Block a user