[jboss-svn-commits] JBoss Portal SVN: r5414 - in trunk/core/src/main/org/jboss/portal/core: aspects/controller controller/ajax

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-10-11 08:08:36 -0400 (Wed, 11 Oct 2006)
New Revision: 5414

Modified:
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java
Log:
- window cannot be moved when logged in + not on dashboard
- disable links for not yet implemented dashboard features

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java	2006-10-10 23:47:49 UTC (rev 5413)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java	2006-10-11 12:08:36 UTC (rev 5414)
@@ -173,7 +173,10 @@
 
          sb.append("<a href=\"").append(pageURL).append("\">").append(label).append("</a>");
 
-         if (dashboard)
+         // For now it is not implemented, we don't want to have feedback such as "Add Content does not work"
+         boolean featureImplemented = false;
+
+         if (dashboard && featureImplemented)
          {
             sb.append("&nbsp;&nbsp;|&nbsp;&nbsp;");
             sb.append("<a href=\"#\">Add Content</a>");
@@ -182,6 +185,7 @@
             sb.append("&nbsp;&nbsp;|&nbsp;&nbsp;");
             sb.append("<a href=\"#\">Add Page</a>");
          }
+
          sb.append("&nbsp;&nbsp;|&nbsp;&nbsp;");
          sb.append("<a href=\"").append(logoutURL).append("\">Logout</a>");
       }

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java	2006-10-10 23:47:49 UTC (rev 5413)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java	2006-10-11 12:08:36 UTC (rev 5414)
@@ -56,6 +56,15 @@
             //
             pageProps.put(ThemeConstants.PORTAL_AJAX_JAVASCRIPT_BASE, "/portal-ajax");
 
+            // If user is logged in and is not on dashboard we disable ajax
+            if (cmd.getControllerContext().getServerInvocation().getServerContext().getClientRequest().getRemoteUser() != null)
+            {
+               if (rpc.isDashboard() == false)
+               {
+                  pageProps.put(ThemeConstants.PORTAL_AJAX_OBJECT_DISABLED, "true");
+               }
+            }
+
             // Compute the url for the ajax servlet
             HttpServletRequest req = cmd.getControllerContext().getServerInvocation().getServerContext().getClientRequest();
             StringBuffer url = new StringBuffer();