r7354 - in dumbhippo/trunk/server: src/com/dumbhippo/web/pages web/tags/2 web/tags/3

[commits mugshot org]

Author: walters
Date: 2008-03-07 16:27:13 -0600 (Fri, 07 Mar 2008)
New Revision: 7354

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/web/pages/GroupPage.java
   dumbhippo/trunk/server/web/tags/2/actionLink.tag
   dumbhippo/trunk/server/web/tags/3/groupStack.tag
Log:
Bug 1378: Switch to explicit acceptance of group join.

We use a larger version of the join link for this case to make it more
obvious.


Modified: dumbhippo/trunk/server/src/com/dumbhippo/web/pages/GroupPage.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/web/pages/GroupPage.java	2008-03-05 22:47:09 UTC (rev 7353)
+++ dumbhippo/trunk/server/src/com/dumbhippo/web/pages/GroupPage.java	2008-03-07 22:27:13 UTC (rev 7354)
@@ -96,21 +96,6 @@
 			return;
 		}
 		
-		// Once the user has accepted the terms of use, viewing a group should
-		// implicitly accepts the invitation to the group
-		if (getSignin().isActive() && 
-			(viewedGroup.getStatus() == MembershipStatus.INVITED || viewedGroup.getStatus() == MembershipStatus.INVITED_TO_FOLLOW)) {
-			// Only UserViewpoints can have INVITED or INVITED_TO_FOLLOW membership status
-			UserViewpoint userView = (UserViewpoint) viewpoint;
-			groupSystem.acceptInvitation(userView, viewedGroup.getGroup());
-			// Reload the view so we get the new status
-			try {
-				viewedGroup = groupSystem.loadGroup(viewpoint, groupGuid);
-			} catch (NotFoundException e) {
-				logger.debug("invalid or inaccessible group id {}", groupId);
-				return;
-			}
-		}
 		groupMember = viewedGroup.getGroupMember();
 	}
 

Modified: dumbhippo/trunk/server/web/tags/2/actionLink.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/2/actionLink.tag	2008-03-05 22:47:09 UTC (rev 7353)
+++ dumbhippo/trunk/server/web/tags/2/actionLink.tag	2008-03-07 22:27:13 UTC (rev 7354)
@@ -7,7 +7,8 @@
 <%@ attribute name="title" required="true" type="java.lang.String" %>
 <%@ attribute name="oneLine" required="false" type="java.lang.Boolean" %>
 <%@ attribute name="disabled" required="false" type="java.lang.Boolean" %>
-<%@ attribute name="underline" required="false" type="java.lang.Boolean" %>
+<%@ attribute name="underline" required="false" type="java.lang.Boolean" %>
+<%@ attribute name="larger" required="false" type="java.lang.Boolean" %>
 
 <c:set var="tagName" value="div"/>
 	
@@ -25,9 +26,13 @@
 
 <c:if test="${underline}">
     <c:set var="underlineClass" value="dh-underlined-link"/>
+</c:if>
+
+<c:if test="${larger}">
+    <c:set var="largerClass" value="dh-larger-link"/>
 </c:if>
 
 <dh:script module="dh.html"/>
 <${tagName} class="dh-action-link">
-    <a ${idAttribute} class="${disabledClass} ${underlineClass}" href="${href}" onclick="return !dh.html.hasClass(this, 'dh-action-link-disabled');" title="${title}"><jsp:doBody/></a>
+    <a ${idAttribute} class="${disabledClass} ${underlineClass} ${largerClass}" href="${href}" onclick="return !dh.html.hasClass(this, 'dh-action-link-disabled');" title="${title}"><jsp:doBody/></a>
 </${tagName}>

Modified: dumbhippo/trunk/server/web/tags/3/groupStack.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/3/groupStack.tag	2008-03-05 22:47:09 UTC (rev 7353)
+++ dumbhippo/trunk/server/web/tags/3/groupStack.tag	2008-03-07 22:27:13 UTC (rev 7354)
@@ -35,7 +35,7 @@
 	            <c:choose>
 	                <c:when test="${who.joinAction != null}">
                         <dh:script module="dh.actions"/>
-						<dht:actionLink oneLine="true" href="javascript:dh.actions.joinGroup('${who.identifyingGuid}')" title="${who.joinTooltip}"><c:out value="${who.joinAction}"/></dht:actionLink>					
+						<dht:actionLink oneLine="true" larger="${who.invited}" href="javascript:dh.actions.joinGroup('${who.identifyingGuid}')" title="${who.joinTooltip}"><c:out value="${who.joinAction}"/></dht:actionLink>					
 	                </c:when>
 	                <c:when test="${who.leaveAction != null}">
                         <dh:script module="dh.actions"/>