jotain kakkaa

code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -552,6 +552,7 @@ public class UserBean implements UserBeanLocal {
 
 
 		List<User> usercheck = userFacade.findByEmail(invitemail);
 		List<User> usercheck = userFacade.findByEmail(invitemail);
 		if (usercheck.size() > 0) {
 		if (usercheck.size() > 0) {
+			logger.info("Email already exists {}", invitemail);
 			return false;
 			return false;
 		}
 		}
 
 

code/moya-web/WebContent/place/myGroups.xhtml

@@ -18,7 +18,7 @@
 			<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
 			<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
 			<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform">	
 			<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform">	
 
 
-				<p:dataTable value="#{placeGroupView.groupMemberships}" var="member">
+				<p:dataTable value="#{placeGroupView.groupMemberships}" var="member" id="placestable">
 
 
 					<p:column>
 					<p:column>
 						<f:facet name="header">
 						<f:facet name="header">
@@ -52,8 +52,8 @@
 						<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull and placeGroupView.currentReleaseAllowed}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
 						<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull and placeGroupView.currentReleaseAllowed}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
 
 
 
 
-						<p:inputText rendered="#{!(placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull and placeGroupView.currentReleaseAllowed)}" value="#{inviteView.invitemail}" />
-						<p:commandButton ajax="false" rendered="#{!(placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull and placeGroupView.currentReleaseAllowed)}"  value="#{i18n['user.invite']}" actionListener="#{placeGroupView.sendInvite}" />
+						<p:inputText immediate="true" rendered="#{!(placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull and placeGroupView.currentReleaseAllowed)}" value="#{placeGroupView.inviteMail}" />
+						<p:commandButton  rendered="#{!(placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull and placeGroupView.currentReleaseAllowed)}"  value="#{i18n['user.invite']}" actionListener="#{placeGroupView.sendInvite}" update=":messages placestable" />
 
 
 					</p:column>
 					</p:column>
 
 

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java

@@ -37,11 +37,15 @@ import fi.codecrew.moya.web.annotations.SelectedUser;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.shop.InviteView;
 import fi.codecrew.moya.web.cdiview.shop.InviteView;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 @Named("placeGroupView")
 @Named("placeGroupView")
 @ConversationScoped
 @ConversationScoped
 public class PlacegroupView extends GenericCDIView {
 public class PlacegroupView extends GenericCDIView {
 
 
 	private static final long serialVersionUID = -3934253910818396155L;
 	private static final long serialVersionUID = -3934253910818396155L;
+	private static final Logger logger = LoggerFactory.getLogger(PlacegroupView.class);
 
 
 	// @Inject
 	// @Inject
 	// private UserView userview;
 	// private UserView userview;
@@ -63,6 +67,10 @@ public class PlacegroupView extends GenericCDIView {
 
 
 	private transient ListDataModel<GroupMembership> memberlist;
 	private transient ListDataModel<GroupMembership> memberlist;
 
 
+
+
+	private String inviteMail;
+
 	public String editGroup() {
 	public String editGroup() {
 		setGroup(placegroups.getRowData());
 		setGroup(placegroups.getRowData());
 		setPlacelist(new ListDataModel<Place>(group.getPlaces()));
 		setPlacelist(new ListDataModel<Place>(group.getPlaces()));
@@ -179,11 +187,23 @@ public class PlacegroupView extends GenericCDIView {
 		if (row != null) {
 		if (row != null) {
 			if (permbean.isCurrentUser(row.getPlaceGroup().getCreator()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
 			if (permbean.isCurrentUser(row.getPlaceGroup().getCreator()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
 
 
+				logger.info("Invitemail is: {} <-- ", inviteMail);
 				inviteView.setInviteGm(row);
 				inviteView.setInviteGm(row);
-
+				inviteView.setInvitemail(inviteMail);
 				inviteView.invite();
 				inviteView.invite();
 
 
 			}
 			}
 		}
 		}
 	}
 	}
+
+	public String getInviteMail() {
+		if(inviteMail == null)
+			return "";
+
+		return inviteMail;
+	}
+
+	public void setInviteMail(String inviteMail) {
+		this.inviteMail = inviteMail;
+	}
 }
 }

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteView.java

@@ -72,6 +72,8 @@ public class InviteView extends GenericCDIView {
 		path.append("/")
 		path.append("/")
 				.append(FacesContext.getCurrentInstance().getExternalContext().getContextName())
 				.append(FacesContext.getCurrentInstance().getExternalContext().getContextName())
 				.append("/user/acceptInvite.jsf?token={0}");
 				.append("/user/acceptInvite.jsf?token={0}");
+
+
 		boolean ret = userbean.invite(invitemail, path.toString(), inviteGm);
 		boolean ret = userbean.invite(invitemail, path.toString(), inviteGm);
 		if (ret) {
 		if (ret) {
 			this.addFaceMessage("invite.successfull");
 			this.addFaceMessage("invite.successfull");