composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 08:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1976 - Duplicate Service on Customer Contract - formating code

Browse Source
This commit is contained in:
acognet
2020-05-27 09:35:02 +02:00
parent d2e286345e
commit 7f922560ba
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
View File

@@ -1643,9 +1643,9 @@ public function PrefillSearchForm(&$aContextParam)
$sOql = "SELECT lnkCustomerContractToService AS ccs WHERE ccs.customercontract_id=:customercontract_id AND ccs.service_id=:service_id"; $sOql = "SELECT lnkCustomerContractToService AS ccs WHERE ccs.customercontract_id=:customercontract_id AND ccs.service_id=:service_id";
$aQueryParams['customercontract_id'] = $oCustomerContracts->Get("customercontract_id"); $aQueryParams['customercontract_id'] = $oCustomerContracts->Get("customercontract_id");
$aQueryParams['service_id'] = $oCustomerContracts->Get("service_id"); $aQueryParams['service_id'] = $oCustomerContracts->Get("service_id");
if($this->Get("id")!=null) if ($this->Get("id") != null)
{ {
$sOql=$sOql." AND ccs.sla_id!=:sla_id"; $sOql = $sOql." AND ccs.sla_id!=:sla_id";
$aQueryParams['sla_id'] = $this->Get("id"); $aQueryParams['sla_id'] = $this->Get("id");
} }
$oQuery = DBSearch::FromOQL($sOql, $aQueryParams); $oQuery = DBSearch::FromOQL($sOql, $aQueryParams);

4
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
View File

@@ -1637,9 +1637,9 @@ public function PrefillSearchForm(&$aContextParam)
$sOql = "SELECT lnkCustomerContractToService AS ccs WHERE ccs.customercontract_id=:customercontract_id AND ccs.service_id=:service_id"; $sOql = "SELECT lnkCustomerContractToService AS ccs WHERE ccs.customercontract_id=:customercontract_id AND ccs.service_id=:service_id";
$aQueryParams['customercontract_id'] = $oCustomerContracts->Get("customercontract_id"); $aQueryParams['customercontract_id'] = $oCustomerContracts->Get("customercontract_id");
$aQueryParams['service_id'] = $oCustomerContracts->Get("service_id"); $aQueryParams['service_id'] = $oCustomerContracts->Get("service_id");
if($this->Get("id")!=null) if ($this->Get("id") != null)
{ {
$sOql=$sOql." AND ccs.sla_id!=:sla_id"; $sOql = $sOql." AND ccs.sla_id!=:sla_id";
$aQueryParams['sla_id'] = $this->Get("id"); $aQueryParams['sla_id'] = $this->Get("id");
} }
$oQuery = DBSearch::FromOQL($sOql, $aQueryParams); $oQuery = DBSearch::FromOQL($sOql, $aQueryParams);