Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240

Browse Source
This commit is contained in:
wangyidong
2022-09-22 08:31:57 +08:00
parent 2a57f28bc5 e5cad7fd7a
commit 0165845882
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/control.php
+1 -1
View File
@@ -654,7 +654,7 @@ class custom extends control
$this->view->position[] = $this->lang->custom->common;
$this->view->position[] = $this->view->title;
$this->view->mode = $mode;
$this->view->program = $this->loadModel('program')->getTopPairs('', '', true);
$this->view->program = $this->loadModel('program')->getTopPairs('', 'noclosed', true);
$this->display();
}
module/custom/css/mode.css
+1
View File
@@ -0,0 +1 @@
#program_chosen {max-width: 170px;}
module/custom/js/mode.js
+2 -1
View File
@@ -1,8 +1,9 @@
$(function()
{
$('#modeTab').addClass('btn-active-text');
$('[name=mode]').change(function(){$("#selectDefaultProgram").toggle($(this).val() == 'lean'); });
$("#program_chosen").css('max-width','170px')
$(document).on('click', '#submit', function()
{
module/custom/view/mode.html.php
+1 -3
View File
@@ -34,9 +34,7 @@
<?php $class = $mode == 'new' ? "class='hide'" : "";?>
<tr id="selectDefaultProgram" <?php echo $class;?>>
<td></td>
<td class='required'>
<?php echo html::select('program', $program, $this->config->global->defaultProgram, "class='form-control chosen'");?>
</td>
<td><?php echo html::select('program', $program, $this->config->global->defaultProgram, "class='form-control chosen'");?></td>
</tr>
<tr>
<td></td>
module/project/lang/de.php
+2 -2
View File
@@ -257,8 +257,8 @@ $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['1'] = "Enable";
$lang->project->noSprintList['0'] = "Disable";
$lang->project->noSprintList['0'] = "Enable";
$lang->project->noSprintList['1'] = "Disable";
$lang->project->acls['private'] = 'Private';
$lang->project->acls['open'] = "Open";
module/project/lang/en.php
+2 -2
View File
@@ -257,8 +257,8 @@ $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['1'] = "Enable";
$lang->project->noSprintList['0'] = "Disable";
$lang->project->noSprintList['0'] = "Enable";
$lang->project->noSprintList['1'] = "Disable";
$lang->project->acls['private'] = 'Private';
$lang->project->acls['open'] = 'Open';
module/project/lang/fr.php
+2 -2
View File
@@ -257,8 +257,8 @@ $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['1'] = "Enable";
$lang->project->noSprintList['0'] = "Disable";
$lang->project->noSprintList['0'] = "Enable";
$lang->project->noSprintList['1'] = "Disable";
$lang->project->acls['private'] = 'Private';
$lang->project->acls['open'] = "Open";
module/project/lang/zh-cn.php
+2 -2
View File
@@ -257,8 +257,8 @@ $lang->project->featureBar['build']['all'] = '所有版本';
$lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)";
$lang->project->aclList['open'] = "公开 (有项目视图权限即可访问)";
$lang->project->noSprintList['1'] = "启用";
$lang->project->noSprintList['0'] = "不启用";
$lang->project->noSprintList['0'] = "启用";
$lang->project->noSprintList['1'] = "不启用";
$lang->project->acls['private'] = '私有';
$lang->project->acls['open'] = '公开';
module/upgrade/control.php
+1 -1
View File
@@ -158,7 +158,7 @@ class upgrade extends control
$openVersion = $this->upgrade->getOpenVersion(str_replace('.', '_', $fromVersion));
$selectMode = true;
if(version_compare($openVersion, '15_0', '>=') and version_compare($openVersion, '18_0', '<') and $systemMode != 'new')
if($systemMode == 'classic')
{
$this->loadModel('setting')->setItem('system.common.global.mode', 'lean');