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

* Fix create build

Browse Source
This commit is contained in:
zenggang
2023-10-25 02:12:17 +00:00
parent 3f02182ca8
commit 394f63d493
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/js/create.ui.js
+9 -9
View File
@@ -125,7 +125,7 @@ function loadArtifactrepo(event)
{
const productID = $(event.target).val();
var data = Object.values(productArtifactRepos[productID]);
var data = Object.values(artifactRepos[productID]);
if(data.length > 0)
{
$('.artifactrepo').removeClass('hidden');
@@ -155,14 +155,14 @@ function onShowArtifactRepo()
{
var productID = $('[name=product]').val();
var data = Object.values(productArtifactRepos[productID]);
var data = Object.values(artifactRepos[productID]);
if(data.length > 0)
{
$('.artifactrepo-id').removeClass('hidden');
var items = [];
for(i in productArtifactRepos[productID])
for(i in artifactRepos[productID])
{
items.push({'text': productArtifactRepos[productID][i].name, 'value': productArtifactRepos[productID][i].id});
items.push({'text': artifactRepos[productID][i].name, 'value': artifactRepos[productID][i].id});
}
$artifactRepo = $('#artifactRepoID').zui('picker');
$artifactRepo.render({items: items});
@@ -192,7 +192,7 @@ function onChangeArtifactRepo(event)
const datePicker = $('#date').datePicker().zui();
var productID = $('[name=product]').val();
var data = Object.values(productArtifactRepos[productID]);
var data = Object.values(artifactRepos[productID]);
if(data.length == 0 || !repoID)
{
$('#filePath').val('');
@@ -200,12 +200,12 @@ function onChangeArtifactRepo(event)
return;
}
for(i in productArtifactRepos[productID])
for(i in artifactRepos[productID])
{
if(productArtifactRepos[productID][i].id == repoID)
if(artifactRepos[productID][i].id == repoID)
{
$('#filePath').val(productArtifactRepos[productID][i].url);
datePicker.$.setValue(productArtifactRepos[productID][i].createdDate.substr(0, 10));
$('#filePath').val(artifactRepos[productID][i].url);
datePicker.$.setValue(artifactRepos[productID][i].createdDate.substr(0, 10));
}
}
}
module/build/zen.php
+4 -4
View File
@@ -26,11 +26,11 @@ class buildZen extends build
{
$productGroups = $branchGroups = array();
$executions = $this->loadModel('execution')->getPairs($projectID, 'all', 'stagefilter|leaf|order_asc');
$executionID = empty($executionID) ? (int)key($executions) : $executionID;
if($executionID)
$executionID = empty($executionID) && !empty($executions) ? (int)key($executions) : $executionID;
if($executionID || $projectID)
{
$productGroups = $this->loadModel('product')->getProducts($executionID, $status);
$branchGroups = $this->loadModel('project')->getBranchesByProject($executionID);
$productGroups = $this->loadModel('product')->getProducts($executionID ? $executionID : $projectID, $status);
$branchGroups = $this->loadModel('project')->getBranchesByProject($executionID ? $executionID : $projectID);
}
$this->commonActions($projectID);