Bläddra i källkod

Adjust the relative path to 'ajax.render.php' so that it can be called from the portal pages as well.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1125 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 14 år sedan
förälder
incheckning
7214a19f61

+ 3 - 3
application/uilinkswizard.class.inc.php

@@ -132,7 +132,7 @@ class UILinksWizard
 		function AddObjects()
 		{
 			// TO DO: compute the list of objects already linked with the current Object
-			$.post( 'ajax.render.php', { 'operation': 'addObjects',
+			$.post( '../pages/ajax.render.php', { 'operation': 'addObjects',
 										'class': '{$this->m_sClass}',
 										'linkageAttr': '{$this->m_sLinkageAttr}',
 										'linkedClass': '{$this->m_sLinkedClass}',
@@ -175,7 +175,7 @@ class UILinksWizard
 			theMap['operation'] = 'searchObjectsToAdd';
 			
 			// Run the query and display the results
-			$.post( 'ajax.render.php', theMap, 
+			$.post( '../pages/ajax.render.php', theMap, 
 				function(data)
 				{
 					$('#SearchResultsToAdd').html(data);
@@ -223,7 +223,7 @@ class UILinksWizard
 			theMap['operation'] = 'doAddObjects';
 			
 			// Run the query and display the results
-			$.post( 'ajax.render.php', theMap, 
+			$.post( '../pages/ajax.render.php', theMap, 
 				function(data)
 				{
 					//console.log('Data: ' + data);

+ 4 - 4
js/extkeywidget.js

@@ -122,7 +122,7 @@ function ExtKeyWidget(id, sClass, sAttCode, sSuffix, bSelectMode, oWizHelper)
 		me.StopPendingRequest();
 		
 		// Run the query and display the results
-		me.ajax_request = $.post( 'ajax.render.php', theMap, 
+		me.ajax_request = $.post( '../pages/ajax.render.php', theMap, 
 			function(data)
 			{
 				$(sSearchAreaId).html(data);
@@ -158,7 +158,7 @@ function ExtKeyWidget(id, sClass, sAttCode, sSuffix, bSelectMode, oWizHelper)
 		me.StopPendingRequest();
 		
 		// Run the query and get the result back directly in JSON
-		me.ajax_request = $.post( 'ajax.render.php', theMap, 
+		me.ajax_request = $.post( '../pages/ajax.render.php', theMap, 
 			function(data)
 			{
 				$('#label_'+me.id).val(data.name);
@@ -213,7 +213,7 @@ function ExtKeyWidget(id, sClass, sAttCode, sSuffix, bSelectMode, oWizHelper)
 		me.StopPendingRequest();
 		
 		// Run the query and get the result back directly in HTML
-		me.ajax_request = $.post( 'ajax.render.php', theMap, 
+		me.ajax_request = $.post( '../pages/ajax.render.php', theMap, 
 			function(data)
 			{
 				$('#ajax_'+me.id).html(data);
@@ -283,7 +283,7 @@ function ExtKeyWidget(id, sClass, sAttCode, sSuffix, bSelectMode, oWizHelper)
 			me.StopPendingRequest();
 			
 			// Run the query and get the result back directly in JSON
-			me.ajax_request = $.post( 'ajax.render.php', theMap, 
+			me.ajax_request = $.post( '../pages/ajax.render.php', theMap, 
 				function(data)
 				{
 					if (me.bSelectMode)

+ 1 - 1
js/forms-json-utils.js

@@ -107,7 +107,7 @@ function ActivateStep(iTargetStep)
 //	if (oObj['m_aCurrValues'][sAttCode] == '')
 //	{
 //		var oJSON = document.getElementById(sJsonFieldId);
-//		$.get('ajax.render.php?class=' + sClass + '&json_obj=' + oJSON.value + '&att_code=' + sAttCode,
+//		$.get('../pages/ajax.render.php?class=' + sClass + '&json_obj=' + oJSON.value + '&att_code=' + sAttCode,
 //		   { operation: "default_value" },
 //		   function(json_data){
 //			 var oObj = ReloadObjectFromServer(json_data);

+ 2 - 2
js/linkswidget.js

@@ -96,7 +96,7 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates)
 		$(sSearchAreaId).block();
 		
 		// Run the query and display the results
-		$.post( 'ajax.render.php', theMap, 
+		$.post( '../pages/ajax.render.php', theMap, 
 			function(data)
 			{
 				$(sSearchAreaId).html(data);
@@ -147,7 +147,7 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates)
 		theMap['operation'] = 'doAddObjects';
 		$('#busy_'+me.iInputId).html('&nbsp;<img src="../images/indicator.gif"/>');
 		// Run the query and display the results
-		$.post( 'ajax.render.php', theMap, 
+		$.post( '../pages/ajax.render.php', theMap, 
 			function(data)
 			{
 				//console.log('Data: ' + data);

+ 5 - 5
js/utils.js

@@ -21,7 +21,7 @@ function ReloadTruncatedList(divId, sSerializedFilter, sExtraParams)
 			console.log('Uh,uh, exception !');
 		}
 	}
-	aTruncatedLists[divId] = $.post('ajax.render.php?style=list',
+	aTruncatedLists[divId] = $.post('../pages/ajax.render.php?style=list',
 	   { operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams },
 	     function(data)
 	     {
@@ -76,7 +76,7 @@ function ReloadBlock(divId, sStyle, sSerializedFilter, sExtraParams)
 {
 	$('#'+divId).block();
 	//$('#'+divId).blockUI();
-	$.post('ajax.render.php?style='+sStyle,
+	$.post('../pages/ajax.render.php?style='+sStyle,
 	   { operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams },
 	   function(data){
 		 $('#'+divId).empty();
@@ -136,7 +136,7 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext)
 		}
 	}
 
-	$.post('ajax.render.php?'+sContext,
+	$.post('../pages/ajax.render.php?'+sContext,
 	   { operation: 'search_form', className: sClassName, baseClass: sBaseClass, currentId: divId },
 	   function(data) {
 		   oDiv.empty();
@@ -182,7 +182,7 @@ function SetUserPreference(sPreferenceCode, sPrefValue, bPersistent)
     oUserPreferences[sPreferenceCode] = sPrefValue;
     if (bPersistent && (sPrefValue != sPreviousValue))
     {
-    	ajax_request = $.post('ajax.render.php',
+    	ajax_request = $.post('../pages/ajax.render.php',
     						  { operation: 'set_pref', code: sPreferenceCode, value: sPrefValue} ); // Make it persistent
     }
 }
@@ -211,4 +211,4 @@ function CheckAll(sSelector, bValue)
 	$(sSelector).each( function() {
 		this.checked = value;
 	});
-}  
+}

+ 1 - 1
js/wizard.utils.js

@@ -42,7 +42,7 @@ function ManageObjects(sTitle, sClass, sId, sExtKeyToRemote)
 function Manage_LoadSelect(sSelectedId, sFilter)
 {
  	$('#'+sSelectedId).addClass('loading');
-	$.post('ajax.render.php',
+	$.post('../pages/ajax.render.php',
 	   { operation: 'combo_options', filter: sFilter },
 	   function(data){
 		 $('#'+sSelectedId).empty();

+ 2 - 2
js/wizardhelper.js

@@ -133,7 +133,7 @@ function WizardHelper(sClass, sFormPrefix)
 	{
 		//console.log('data sent:', this.ToJSON());
 		//console.log('oWizard:', this);
-		$.post('ajax.render.php',
+		$.post('../pages/ajax.render.php',
 		   { operation: 'wizard_helper', json_obj: this.ToJSON() },
 			function(html){
 				$('#ajax_content').html(html);
@@ -149,7 +149,7 @@ function WizardHelper(sClass, sFormPrefix)
 	{
 		//console.log('data sent:', this.ToJSON());
 		//console.log('oWizard:', this);
-		$('#'+divId).load('ajax.render.php?operation=wizard_helper_preview',
+		$('#'+divId).load('../pages/ajax.render.php?operation=wizard_helper_preview',
 		   	{'json_obj': this.ToJSON()},
 			function(responseText, textStatus, XMLHttpRequest){
 				$('#wizStep'+ G_iCurrentStep).unblock( {fadeOut: 0} );