[gatein-commits] gatein SVN: r7170 - in portal/trunk: web/eXoResources/src/main/webapp/javascript/eXo/portal and 1 other directory.
Author: trong.tran
Date: 2011-08-18 07:13:41 -0400 (Thu, 18 Aug 2011)
New Revision: 7170
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js
Log:
GTNPORTAL-2030 Show message when delete application in page
GTNPORTAL-2029 Can't drag & drop container when edit page or layout
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
===================================================================
---
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-17
22:44:43 UTC (rev 7169)
+++
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-18
11:13:41 UTC (rev 7170)
@@ -226,7 +226,7 @@
String gadgetUrl = GadgetUtil.reproduceUrl(gadget.getUrl(), gadget.isLocal());
String metadataUrl = gadgetServerUrl + (gadgetServerUrl.endsWith("/")
? "" : "/") + "metadata";
String queryString =
"{\"context\":{\"ignoreCache\":\"true\"},\"gadgets\":["
+ "{\"url\":\"" + gadgetUrl + "\"}]}";
-
event.getRequestContext().getJavascriptManager().addJavascript("ajaxAsyncRequest('"
+ metadataUrl + "', true, 'POST', '" + queryString +
"');");
+
event.getRequestContext().getJavascriptManager().addJavascript("ajaxRequest('"
+ metadataUrl + "', true, 'POST', '" + queryString +
"');");
}
}
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js
===================================================================
---
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js 2011-08-17
22:44:43 UTC (rev 7169)
+++
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js 2011-08-18
11:13:41 UTC (rev 7170)
@@ -724,28 +724,35 @@
} ;
/**
- * Create a ajax GET request
+ * Create an ajax GET request
* @param {String} url - Url
* @param {boolean} async - asynchronous or none
* @return {String} response text if request is not async
*/
function ajaxAsyncGetRequest(url, async) {
- ajaxAsyncRequest("GET", url, async);
+ ajaxRequest("GET", url, async);
}
/**
- * Create a ajax request
+ * Create an ajax request
* @param {String} method - GET, POST, etc
* @param {String} url - Url
* @param {boolean} async - asynchronous or none
* @return {String} response text if request is not async
*/
-function ajaxAsyncRequest(url, async, method, queryString) {
+function ajaxRequest(method, url, async, queryString) {
if(async == undefined) async = true ;
var request = eXo.core.Browser.createHttpRequest() ;
request.open(method, url, async) ;
request.setRequestHeader("Cache-Control", "max-age=86400") ;
- request.send((queryString != undefined && queryString != null) ? queryString :
null) ;
+ if(queryString)
+ {
+ request.send(queryString) ;
+ }
+ else
+ {
+ request.send(null);
+ }
eXo.session.itvDestroy() ;
if(eXo.session.canKeepState && eXo.session.isOpen &&
eXo.env.portal.accessMode == 'private') {
eXo.session.itvInit() ;