composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 17:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Oops, wrong commit, reverting these two files to their previous version.

Browse Source 
SVN:trunk[3526]
This commit is contained in:
Denis Flaven
2015-04-01 16:04:20 +00:00
parent 030b4fa380
commit 828e4d6297
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
synchro/synchrodatasource.class.inc.php
View File

@@ -1824,13 +1824,6 @@ class SynchroReplica extends DBObject implements iDisplay
*/
protected function UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, &$oStatLog, $sStatsCode, $sStatsCodeError)
{
if (!is_object($oDestObj))
{
IssueLog::Error('About to update a NON object in UpdateObjectFromReplica. Replica_id = '.$this->GetKey().' $oDestObj = '.var_export($oDestObj, true));
IssueLog::Error(MyHelpers::get_callstack_text());
return false;
}
$aValueTrace = array();
$bModified = false;
try

12
webservices/itopsoap.examples.php
View File

@@ -25,7 +25,7 @@
*/
require_once('itopsoaptypes.class.inc.php');
$sItopRoot = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/..';
$sItopRoot = 'http'.(utils::IsConnectionSecure() ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/..';
$sWsdlUri = $sItopRoot.'/webservices/itop.wsdl.php';
//$sWsdlUri .= '?service_category=';
@@ -58,19 +58,19 @@ try
'HW found shutdown', /* description */
null, /* caller */
new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Demo'))), /* customer */
new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Computers and peripherals'))), /* service */
new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'NW Management'))), /* service */
new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Troubleshooting'))), /* service subcategory */
'', /* product */
new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Network support'))), /* workgroup */
new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'NW support'))), /* workgroup */
array(
new SOAPLinkCreationSpec(
'NetworkDevice',
array(new SOAPSearchCondition('name', 'Switch1')),
'Device',
array(new SOAPSearchCondition('name', 'switch01')),
array()
),
new SOAPLinkCreationSpec(
'Server',
array(new SOAPSearchCondition('name', 'Server1')),
array(new SOAPSearchCondition('name', 'dbserver1.demo.com')),
array()
),
), /* impacted cis */