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

* Finish task #41607.

Browse Source
This commit is contained in:
tianshujie
2021-08-27 08:34:16 +08:00
parent 81781c80f0
commit 4d65433171
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/control.php
+3 -3
View File
@@ -578,9 +578,9 @@ class upgrade extends control
die(js::locate($this->createLink('upgrade', 'mergeRepo'), 'parent'));
}
$repos = $this->dao->select('id, name')->from(TABLE_REPO)->where('deleted')->eq(0)->andWhere('product')->eq('')->fetchPairs();
$repoes = $this->dao->select('id, name')->from(TABLE_REPO)->where('deleted')->eq(0)->andWhere('product')->eq('')->fetchPairs();
$products = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('deleted')->eq(0)->fetchPairs();
if(empty($repos) or empty($products))
if(empty($repoes) or empty($products))
{
$this->dao->delete()->from(TABLE_BLOCK)->exec();
$this->dao->delete()->from(TABLE_CONFIG)->where('`key`')->eq('blockInited')->exec();
@@ -589,7 +589,7 @@ class upgrade extends control
}
$this->view->title = $this->lang->upgrade->mergeRepo;
$this->view->repos = $repos;
$this->view->repoes = $repoes;
$this->view->products = $products;
$this->view->programs = $this->dao->select('id, name')->from(TABLE_PROGRAM)->where('deleted')->eq(0)->andWhere('type')->eq('program')->fetchPairs();
module/upgrade/js/mergerepo.js
+7 -7
View File
@@ -9,8 +9,8 @@ $(function()
$('[data-id=' + e.id + ']').prop('checked', true);
var checked = true;
var repoNum = $("[id^='repos'").length;
var checkedRepoNum = $("[id^='repos']:checked").length;
var repoNum = $("[id^='repoes'").length;
var checkedRepoNum = $("[id^='repoes']:checked").length;
if(repoNum > checkedRepoNum) checked = false;
$('#checkAllRepos').prop('checked', checked);
@@ -25,21 +25,21 @@ $(function()
{
if($(this).is(':checked'))
{
$('[name^=repos]').prop('checked', true);
$('[name^=repoes]').prop('checked', true);
}
else
{
$('[name^=repos]').prop('checked', false);
$('[name^=repoes]').prop('checked', false);
}
})
/* Select a repo event. */
$('[name^=repos]').change(function()
$('[name^=repoes]').change(function()
{
/* Determine whether all repo buttons are selected. */
var checked = true;
var repoNum = $("[id^='repos'").length;
var checkedRepoNum = $("[id^='repos']:checked").length;
var repoNum = $("[id^='repoes'").length;
var checkedRepoNum = $("[id^='repoes']:checked").length;
if(repoNum > checkedRepoNum) checked = false;
$('#checkAllRepos').prop('checked', checked);
module/upgrade/model.php
+1 -1
View File
@@ -4785,7 +4785,7 @@ class upgradeModel extends model
->join('products', ',')
->get();
foreach($data->repos as $repoID) $this->dao->update(TABLE_REPO)->set('product')->eq($data->products)->where('id')->eq($repoID)->exec();
foreach($data->repoes as $repoID) $this->dao->update(TABLE_REPO)->set('product')->eq($data->products)->where('id')->eq($repoID)->exec();
}
/**
module/upgrade/view/mergerepo.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
</div>
</div>
<div class='lineGroup-body'>
<?php echo html::checkBox("repos", $repos, "class='form-control'");?>
<?php echo html::checkBox("repoes", $repoes, "class='form-control'");?>
</div>
</div>
</div>