From 3df06bbb03d55d05ac9f17a1bdea55aba1934966 Mon Sep 17 00:00:00 2001 From: wangyuting <851424971@qq.com> Date: Tue, 22 Nov 2022 08:37:59 +0000 Subject: [PATCH] * Optimize code. --- module/build/js/create.js | 2 +- module/build/js/edit.js | 2 +- module/build/model.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/build/js/create.js b/module/build/js/create.js index 869403068c..217ea6e9a6 100644 --- a/module/build/js/create.js +++ b/module/build/js/create.js @@ -9,7 +9,7 @@ $().ready(function() { var productID = $('#product').val(); var branch = $('#branch').length > 0 ? $('#branch').val() : ''; - $.get(createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=builds&build=&branch=' + branch + '&index=&needCreate=&type=noempty,notrunk,separate,noproject&extra=multiple'), function(data) + $.get(createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=builds&build=&branch=' + branch + '&index=&needCreate=&type=noempty,notrunk,separate,singled&extra=multiple'), function(data) { if(data) $('#buildBox').html(data); $('#builds').attr('data-placeholder', multipleSelect).chosen(); diff --git a/module/build/js/edit.js b/module/build/js/edit.js index f77ec85bd9..7088791ec2 100644 --- a/module/build/js/edit.js +++ b/module/build/js/edit.js @@ -11,7 +11,7 @@ $().ready(function() { var productID = $('#product').val(); var branch = $('#branch').val(); - $.get(createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=builds&build=&branch=' + branch + '&index=&needCreate=&type=noempty,notrunk,separate,noproject&extra=multiple'), function(data) + $.get(createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=builds&build=&branch=' + branch + '&index=&needCreate=&type=noempty,notrunk,separate,singled&extra=multiple'), function(data) { if(data) $('#buildBox').html(data); $('#builds').attr('data-placeholder', multipleSelect).chosen(); diff --git a/module/build/model.php b/module/build/model.php index 3c403715b9..896156bd94 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -235,7 +235,7 @@ class buildModel extends model ->leftJoin(TABLE_PRODUCT)->alias('t5')->on('t1.product = t5.id') ->where('1=1') ->beginIF(strpos($params, 'hasDeleted') === false)->andWhere('t1.deleted')->eq(0)->fi() - ->beginIF(strpos($params, 'noproject') !== false)->andWhere('t1.project')->ne(0)->fi() + ->beginIF(strpos($params, 'singled') !== false)->andWhere('t1.execution')->ne(0)->fi() ->beginIF($products)->andWhere('t1.product')->in($products)->fi() ->beginIF($objectType === 'execution' and $objectID)->andWhere('t1.execution')->eq($objectID)->fi() ->beginIF($objectType === 'project' and $objectID)->andWhere('t1.project')->eq($objectID)->fi()