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

* fix bug meeting

Browse Source
This commit is contained in:
lanzongjun
2022-09-23 17:25:45 +08:00
parent a478be994f
commit 905a71ddf7
12 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/css/mode.css
+2 -1
View File
@@ -1 +1,2 @@
#program_chosen {max-width: 170px;}
#program_chosen {max-width: 170px;}
.table-form>tbody>tr>th {width: 130px;}
module/custom/js/mode.js
+13 -1
View File
@@ -2,7 +2,19 @@ $(function()
{
$('#modeTab').addClass('btn-active-text');
$('[name=mode]').change(function(){$("#selectDefaultProgram").toggle($(this).val() == 'lean'); });
$('[name=mode]').change(function()
{
if($(this).val() != mode)
{
$('#submit').removeAttr('disabled');
}
else
{
$('#submit').attr('disabled',true);
}
if(mode == 'lean') return;
$("#selectDefaultProgram").toggle($(this).val() == 'lean');
});
$(document).on('click', '#submit', function()
module/custom/lang/de.php
+1
View File
@@ -297,3 +297,4 @@ $lang->custom->reviewRules['allpass'] = 'All passed';
$lang->custom->reviewRules['halfpass'] = 'More than half passed';
$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set';
$lang->custom->selectDefaultProgram = 'Select the default program';
module/custom/lang/en.php
+1
View File
@@ -297,3 +297,4 @@ $lang->custom->reviewRules['allpass'] = 'All passed';
$lang->custom->reviewRules['halfpass'] = 'More than half passed';
$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set';
$lang->custom->selectDefaultProgram = 'Select the default program';
module/custom/lang/fr.php
+1
View File
@@ -297,3 +297,4 @@ $lang->custom->reviewRules['allpass'] = 'All passed';
$lang->custom->reviewRules['halfpass'] = 'More than half passed';
$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set';
$lang->custom->selectDefaultProgram = 'Select the default program';
module/custom/lang/zh-cn.php
+1
View File
@@ -297,3 +297,4 @@ $lang->custom->reviewRules['allpass'] = '全部通过通过';
$lang->custom->reviewRules['halfpass'] = '半数以上通过通过';
$lang->custom->switchModeHelper = '请选择一个默认项目集，后续在系统中新增的数据将关联在默认项目集下';
$lang->custom->selectDefaultProgram = '选择默认项目集';
module/custom/view/mode.html.php
+4 -4
View File
@@ -31,19 +31,19 @@
</p>
</td>
</tr>
<?php $class = $mode == 'new' ? "class='hide'" : "";?>
<tr id="selectDefaultProgram" <?php echo $class;?>>
<tr id="selectDefaultProgram" class='hide'>
<td></td>
<td>
<?php
$disabled = $mode == 'lean' ? "disabled" : '';
echo html::select('program', $program, $programID, "class='form-control chosen' $disabled" );
?>
<div class="text-danger help-text"><?php echo $lang->custom->switchModeHelper ?></div>
</td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton($lang->custom->switch);?></td>
<th class='text-top'><?php echo $lang->custom->selectDefaultProgram;?></th>
<td><?php echo html::submitButton($lang->custom->switch, 'disabled');?></td>
</tr>
</table>
</form>
module/install/control.php
+2 -1
View File
@@ -240,7 +240,8 @@ class install extends control
if($this->post->importDemoData) $this->install->importDemoData();
if($this->config->systemMode == 'lean')
$defaultProgram = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=defaultProgram');
if($this->config->systemMode == 'lean' and empty($defaultProgram))
{
/* Lean mode create default program. */
$programID = $this->loadModel('program')->createDefaultProgram();
module/install/css/step4.css
+1
View File
@@ -12,3 +12,4 @@
#useNew {background-color: #ddd!important; padding: 6px 85px;}
#mainContent .datatable {cursor: default;}
.container {padding-top: 20px;}
module/project/control.php
+11 -4
View File
@@ -580,10 +580,14 @@ class project extends control
{
$this->lang->project->aclList = $this->lang->project->kanbanAclList;
$this->lang->project->subAclList = $this->lang->project->kanbanSubAclList;
$this->lang->project->noSprint = $this->lang->project->kanban;
}
if($model == 'scrum')
$sprintConcept = empty($this->config->custom->sprintConcept) ?
$this->config->executionCommonList[$this->app->getClientLang()][0] :
$this->config->executionCommonList[$this->app->getClientLang()][1];
$this->lang->project->noSprint = sprintf($this->lang->project->noSprint,$sprintConcept);
if(common::checkNotCN())
{
$this->lang->project->noSprint = empty($this->config->custom->sprintConcept) ?
$this->config->executionCommonList[$this->app->getClientLang()][0] :
@@ -736,9 +740,12 @@ class project extends control
if($project->model != 'kanban') $canChangeModel = $this->project->checkCanChangeModel($projectID, $project->model);
if($project->model == 'kanban') $this->lang->project->noSprint = $this->lang->project->kanban;
$sprintConcept = empty($this->config->custom->sprintConcept) ?
$this->config->executionCommonList[$this->app->getClientLang()][0] :
$this->config->executionCommonList[$this->app->getClientLang()][1];
if($project->model == 'scrum')
$this->lang->project->noSprint = sprintf($this->lang->project->noSprint,$sprintConcept);
if(common::checkNotCN())
{
$this->lang->project->noSprint = empty($this->config->custom->sprintConcept) ?
$this->config->executionCommonList[$this->app->getClientLang()][0] :
module/project/lang/zh-cn.php
+1 -1
View File
@@ -346,4 +346,4 @@ $lang->project->confirmUnlinkMember = "您确定从该项目中移除该用户
$lang->project->action = new stdclass();
$lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
$lang->project->noSprint = '是否启用迭代';
$lang->project->noSprint = '是否启用%s';
module/upgrade/css/to18guide.css
+1
View File
@@ -12,3 +12,4 @@
#useNew {background-color: #ddd!important; padding: 6px 85px;}
#mainContent .datatable {cursor: default;}
.container {padding-top: 20px;}