[mashup-dev] svn commit r11809 - in trunk/mashup/java/modules/www: . js

[svn at wso2.org]

Author: channa
Date: Thu Jan  3 01:56:52 2008
New Revision: 11809

Log:

Added signup link to sign-in page (JIRA 479). Added check to handle non-string error details (partial fix for JIRA 489).

Modified:
   trunk/mashup/java/modules/www/header.jsp
   trunk/mashup/java/modules/www/js/services.js

Modified: trunk/mashup/java/modules/www/header.jsp
==============================================================================
--- trunk/mashup/java/modules/www/header.jsp	(original)
+++ trunk/mashup/java/modules/www/header.jsp	Thu Jan  3 01:56:52 2008
@@ -32,9 +32,11 @@
                     <li class="tab"><a href="signout.jsp?bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>">Sign out</a></li><li class="tab-right"><img src="images/blank.gif" width="8"/></li>
 <%      } else { %>
                     <li class="tab"><a href="signin.jsp?bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>">Sign in</a></li><li class="tab-right"><img src="images/blank.gif" width="8"/></li>
-                    <li class="tab"><a href="register_self.jsp?firstcall=true&bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>">Sign up</a></li><li class="tab-right"><img src="images/blank.gif" width="8"/></li>
 <%      }
-    }  %>
+    }
+if (!RegistryUtils.isLoggedIn(registry)) { %>
+                    <li class="tab"><a href="register_self.jsp?firstcall=true&bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>">Sign up</a></li><li class="tab-right"><img src="images/blank.gif" width="8"/></li>
+<% } %>                    
                 </ul>
             </td>
         </tr>

Modified: trunk/mashup/java/modules/www/js/services.js
==============================================================================
--- trunk/mashup/java/modules/www/js/services.js	(original)
+++ trunk/mashup/java/modules/www/js/services.js	Thu Jan  3 01:56:52 2008
@@ -481,7 +481,7 @@
         wso2.wsf.Util.alertMessage("Your session has expired.");
         //Envoking force logout
         wso2.mashup.handleLogout();
-    } else if (error.detail.indexOf("NS_ERROR_NOT_AVAILABLE") > -1) {
+    } else if (typeof (error.detail.indexOf) != "undefined" && error.detail.indexOf("NS_ERROR_NOT_AVAILABLE") > -1) {
         wso2.wsf.Util.alertMessage("Your session has expired.");
         //Envoking force logout
         wso2.mashup.handleLogout();