You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by vk...@apache.org on 2009/02/27 16:57:04 UTC
svn commit: r748566 - in /portals/applications:
demo/src/main/webapp/WEB-INF/view/database-view.vm
gems/src/main/java/org/apache/portals/gems/browser/DatabaseBrowserPortlet.java
gems/src/main/java/org/apache/portals/gems/file/FilePortlet.java
Author: vkumar
Date: Fri Feb 27 15:57:03 2009
New Revision: 748566
URL: http://svn.apache.org/viewvc?rev=748566&view=rev
Log:
Some More fixes on Database browser
Modified:
portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm
portals/applications/gems/src/main/java/org/apache/portals/gems/browser/DatabaseBrowserPortlet.java
portals/applications/gems/src/main/java/org/apache/portals/gems/file/FilePortlet.java
Modified: portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm
URL: http://svn.apache.org/viewvc/portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm?rev=748566&r1=748565&r2=748566&view=diff
==============================================================================
--- portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm (original)
+++ portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm Fri Feb 27 15:57:03 2009
@@ -31,11 +31,13 @@
$xlsLink.setParameter("exportType","xlsExport")
#set ($xmlLink = $renderResponse.createActionURL())
$xmlLink.setParameter("exportType","xmlExport")
+#if ($tableSize > 0)
<table>
<tr>
<td><a target="_blank" href="$xlsLink">XLS</a> <!--<a target="_blank" href="$xmlLink">XML</a>--></td>
</tr>
</table>
+#end
<table cellpadding=0 cellspacing=1 border=0 width="100%">
<tbody>
<tr>
Modified: portals/applications/gems/src/main/java/org/apache/portals/gems/browser/DatabaseBrowserPortlet.java
URL: http://svn.apache.org/viewvc/portals/applications/gems/src/main/java/org/apache/portals/gems/browser/DatabaseBrowserPortlet.java?rev=748566&r1=748565&r2=748566&view=diff
==============================================================================
--- portals/applications/gems/src/main/java/org/apache/portals/gems/browser/DatabaseBrowserPortlet.java (original)
+++ portals/applications/gems/src/main/java/org/apache/portals/gems/browser/DatabaseBrowserPortlet.java Fri Feb 27 15:57:03 2009
@@ -742,7 +742,13 @@
return replacePlaceHolder(query.toString(),request);
}
private String replacePlaceHolder(String buffer, PortletRequest request){
- String userName = request.getUserPrincipal().getName();
+ String userName="";
+ if(request.getUserPrincipal()!=null)
+ {
+ userName = request.getUserPrincipal().getName();
+ }else{
+ userName = "guest";
+ }
buffer = buffer.replace("$USER", "'" + userName + "'");
return buffer;
}
Modified: portals/applications/gems/src/main/java/org/apache/portals/gems/file/FilePortlet.java
URL: http://svn.apache.org/viewvc/portals/applications/gems/src/main/java/org/apache/portals/gems/file/FilePortlet.java?rev=748566&r1=748565&r2=748566&view=diff
==============================================================================
--- portals/applications/gems/src/main/java/org/apache/portals/gems/file/FilePortlet.java (original)
+++ portals/applications/gems/src/main/java/org/apache/portals/gems/file/FilePortlet.java Fri Feb 27 15:57:03 2009
@@ -35,7 +35,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;