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

* Fix bug #17208.

Browse Source
This commit is contained in:
tianshujie
2021-12-08 08:44:41 +08:00
parent 834684ca51
commit bca286c0aa
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/js/mergeprogram.js
+3 -4
View File
@@ -441,17 +441,16 @@ $(function()
if(lineID && $('[data-lineid=' + lineID + ']').length > 0 && !$('[data-lineid=' + lineID + ']').prop('checked')) $('[data-lineid=' + lineID + ']').prop('checked', true);
$('#programName').val($("[lineid='" + lineID + "']").find('a').text());
$('#programStatus').val('wait');
$('#programStatus').trigger('chosen:updated');
}
else
{
$('[data-product=' + value + ']').prop('checked', false)
$('#programName').val('');
$('#programStatus').val('wait');
$('#programStatus').trigger('chosen:updated');
}
$('#programStatus').val('wait');
$('#programStatus').trigger('chosen:updated');
var checkedProject = true;
if($('[id^=productLines]').length > 0)
{
module/upgrade/model.php
-6
View File
@@ -4369,12 +4369,6 @@ class upgradeModel extends model
$this->loadModel('action')->create('program', $programID, 'openedbysystem');
if($data->programStatus == 'closed') $this->loadModel('action')->create('program', $programID, 'closedbysystem');
}
else
{
$programID = $data->programID ? $data->programID : $data->programs;
$this->dao->update(TABLE_PROGRAM)->set('status')->eq($data->programStatus)->where('id')->eq($programID)->exec();
if($data->programStatus == 'closed') $this->loadModel('action')->create('program', $programID, 'openedbysystem');
}
if(isset($data->newLine))
{