#838 following on the bug fix: more standard naming for the parameters of the query

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3008 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
   <constants>
-    <constant id="RESPONSE_TICKET_SLT_QUERY" xsi:type="string" _delta="define"><![CDATA[SELECT SLT AS slt JOIN lnkSLAToSLT AS l1 ON l1.slt_id=slt.id JOIN SLA AS sla ON l1.sla_id=sla.id JOIN lnkCustomerContractToService AS l2 ON l2.sla_id=sla.id JOIN CustomerContract AS sc ON l2.customercontract_id=sc.id WHERE slt.metric = :metric AND l2.service_id = :service AND sc.org_id = :customer AND slt.request_type = :request_type AND slt.priority = :priority]]></constant>
+    <constant id="RESPONSE_TICKET_SLT_QUERY" xsi:type="string" _delta="define"><![CDATA[SELECT SLT AS slt JOIN lnkSLAToSLT AS l1 ON l1.slt_id=slt.id JOIN SLA AS sla ON l1.sla_id=sla.id JOIN lnkCustomerContractToService AS l2 ON l2.sla_id=sla.id JOIN CustomerContract AS sc ON l2.customercontract_id=sc.id WHERE slt.metric = :metric AND l2.service_id = :this->service_id AND sc.org_id = :this->org_id AND slt.request_type = :request_type AND slt.priority = :this->priority]]></constant>
   </constants>
   <classes>
     <class id="Ticket" _delta="define">

datamodels/2.x/itop-tickets/main.itop-tickets.php

@@ -41,17 +41,15 @@ class ResponseTicketSLT
 			{
 				$sRequestType = $oTicket->Get('request_type');
 			}
+			
+			$aArgs = $oTicket->ToArgs();
+			$aArgs['metric'] = $sMetric;
+			$aArgs['request_type'] = $sRequestType;
 				
 			//echo "<p>Managing:".$sMetric."-".$this->Get('request_type')."-".$this->Get('importance')."</p>\n";
 			$oSLTSet = new DBObjectSet(DBObjectSearch::FromOQL(RESPONSE_TICKET_SLT_QUERY),
 						array(),
-						array(
-							'metric' => $sMetric,
-							'service' => $oTicket->Get('service_id'),
-							'customer' => $oTicket->Get('org_id'),
-							'request_type' => $sRequestType,
-							'priority' => $oTicket->Get('priority'),
-							)
+						$aArgs
 						);
 
 			$iMinDuration = PHP_INT_MAX;