Author: woonsan
Date: Thu Dec 10 16:35:16 2009
New Revision: 889315
URL: http://svn.apache.org/viewvc?rev=889315&view=rev
Log:
JS2-1057: Fixing rest api url and portal path parameter.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=889315&r1=889314&r2=889315&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Thu Dec 10 16:35:16 2009
@@ -35,7 +35,6 @@
<c:if test="${empty portalContextPath}">
<c:set var="portalContextPath" value="/"/>
</c:if>
-<c:set var="portalServletPath" value="${requestContext.request.servletPath}"/>
<table style="border-collapse: collapse; width: 100%; margin-top: 0px;
margin-bottom: 0px; float: left;">
<tr>
@@ -207,7 +206,7 @@
var onLoadPortletComplete = function(id, o, args) {
var id = id; // Transaction ID.
- var data = o.responseText; // Response data.
+ var data = o.responseText;
var dataOut = null;
try {
@@ -292,9 +291,23 @@
};
var onAddPortletComplete = function(id, o, args) {
- if (o.status == 200) {
- location.href = location.href;
+ var id = id;
+ var data = o.responseText;
+ var dataOut = null;
+
+ try {
+ dataOut = Y.JSON.parse(data);
+ if (!dataOut) {
+ Y.log("Error: no data found.");
+ return;
+ }
+ } catch (e) {
+ Y.log("Error: " + e.message);
+ return;
}
+
+ //TODO: update page without refreshing.
+ location.href = location.href;
};
var addPortlet = function(e) {
@@ -302,12 +315,11 @@
var portletUniqueName = a.getAttribute("portletUniqueName");
if (portletUniqueName) {
- var re = new RegExp("\\" + "${portalServletPath}" + "(\\/|$)");
- var uri = location.href.replace(re, "/services/").replace(/#$/,
"");
+ var uri =
"${portalContextPath}/services/pagelayout/fragment/portlet/" +
portletUniqueName + "/?_type=json";
var config = {
on: { complete: onAddPortletComplete },
method: "POST",
- data: "type=portlet&name=" + portletUniqueName
+ data: "_portalpath=${requestContext.portalURL.path}"
};
var request = Y.io(uri, config);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
