portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r605303 - /portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
Date Tue, 18 Dec 2007 19:16:40 GMT
Author: smilek
Date: Tue Dec 18 11:16:40 2007
New Revision: 605303

URL: http://svn.apache.org/viewvc?rev=605303&view=rev
Log:
changed return page code when used from /desktop to return to page mode (edit or view) which
was active when add-portlet was initiated

Modified:
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm?rev=605303&r1=605302&r2=605303&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
Tue Dec 18 11:16:40 2007
@@ -228,11 +228,16 @@
   var a2 = document.createElement("a");
   a2.innerHTML = "[$messages.getString("goback")]";  // TODO: localize
   // TODO: determine if JETSPEED or DESKTOP 
-  a2.href = getReturnURL();
+  var retHref = null;
+  if ( jetspeed.url.isDesktop() && jetspeed.page )
+     retHref = "javascript: jetspeed.page.addPortletTerminate( '" + getReturnURL() + "',
'" + getReturnPagePath() + "' )";
+  else
+     retHref = getReturnURL();
+  a2.href = retHref;
   a2.setAttribute("style", "font-weight:normal");
   c2.appendChild(a2);
   var prevButton = document.getElementById("previousButton");
-  prevButton.setAttribute('href', getReturnURL());
+  prevButton.setAttribute('href', retHref);
 }
 function displayGridPortlet()
 {



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message