Merge branch 'usersearch-refactor' into 'master'

Change usersearch in place edit to search this events users, not all users

See merge request !428

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

@@ -79,31 +79,31 @@
 						<f:facet name="header">
 						<f:facet name="header">
 							<h:outputText value="Id" />
 							<h:outputText value="Id" />
 						</f:facet>
 						</f:facet>
-						<h:outputText value="#{user.id}" />
+						<h:outputText value="#{user.user.id}" />
 					</h:column>
 					</h:column>
 					<h:column>
 					<h:column>
 						<f:facet name="header">
 						<f:facet name="header">
 							<h:outputText value="#{i18n['user.login']}" />
 							<h:outputText value="#{i18n['user.login']}" />
 						</f:facet>
 						</f:facet>
-						<h:outputText value="#{user.login}" />
+						<h:outputText value="#{user.user.login}" />
 					</h:column>
 					</h:column>
 					<h:column>
 					<h:column>
 						<f:facet name="header">
 						<f:facet name="header">
 							<h:outputText value="#{i18n['user.nick']}" />
 							<h:outputText value="#{i18n['user.nick']}" />
 						</f:facet>
 						</f:facet>
-						<h:outputText value="#{user.nick}" />
+						<h:outputText value="#{user.user.nick}" />
 					</h:column>
 					</h:column>
 					<h:column>
 					<h:column>
 						<f:facet name="header">
 						<f:facet name="header">
 							<h:outputText value="#{i18n['user.firstNames']}" />
 							<h:outputText value="#{i18n['user.firstNames']}" />
 						</f:facet>
 						</f:facet>
-						<h:outputText value="#{user.firstnames}" />
+						<h:outputText value="#{user.user.firstnames}" />
 					</h:column>
 					</h:column>
 					<h:column>
 					<h:column>
 						<f:facet name="header">
 						<f:facet name="header">
 							<h:outputText value="#{i18n['user.lastName']}" />
 							<h:outputText value="#{i18n['user.lastName']}" />
 						</f:facet>
 						</f:facet>
-						<h:outputText value="#{user.lastname}"/>
+						<h:outputText value="#{user.user.lastname}"/>
 					</h:column>
 					</h:column>
 					<h:column>
 					<h:column>
 						<h:commandButton action="#{placeView.reserveForUser()}" value="#{i18n['place.reserveForUser']}" />
 						<h:commandButton action="#{placeView.reserveForUser()}" value="#{i18n['place.reserveForUser']}" />

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

@@ -30,6 +30,7 @@ import javax.faces.model.ListDataModel;
 import javax.inject.Inject;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -76,7 +77,7 @@ public class PlaceView extends GenericCDIView {
 	private EventMap currentMap;
 	private EventMap currentMap;
 
 
 	private String searchuser;
 	private String searchuser;
-	private ListDataModel<User> userlist;
+	private ListDataModel<EventUser> userlist;
 
 
 	public boolean canEdit() {
 	public boolean canEdit() {
 		return permbean.hasPermission(MapPermission.MANAGE_MAPS);
 		return permbean.hasPermission(MapPermission.MANAGE_MAPS);
@@ -170,7 +171,7 @@ public class PlaceView extends GenericCDIView {
 	public String reserveForUser() {
 	public String reserveForUser() {
 
 
 		try {
 		try {
-			EventUser user = userbean.getEventUser(userlist.getRowData(), true);
+			EventUser user = userlist.getRowData();
 			if (placebean.reservePlace(place, user)) {
 			if (placebean.reservePlace(place, user)) {
 				PlaceGroup newgroup = placebean.buySelectedPlaces(user);
 				PlaceGroup newgroup = placebean.buySelectedPlaces(user);
 				for (Place p : newgroup.getPlaces()) {
 				for (Place p : newgroup.getPlaces()) {
@@ -193,7 +194,8 @@ public class PlaceView extends GenericCDIView {
 
 
 	public String searchUser() {
 	public String searchUser() {
 		super.beginConversation();
 		super.beginConversation();
-		userlist = new ListDataModel<User>(userbean.getUsers(new SearchQuery(0, 20, null, searchuser, QuerySortOrder.DESCENDING)).getResults());
+
+		userlist = new ListDataModel<EventUser>(userbean.getThisEventsUsers(new UserSearchQuery(0, 20, null, searchuser, QuerySortOrder.DESCENDING)).getResults());
 		return null;
 		return null;
 	}
 	}
 
 
@@ -206,6 +208,8 @@ public class PlaceView extends GenericCDIView {
 		if (!placebean.releasePlace(place)) {
 		if (!placebean.releasePlace(place)) {
 			logger.debug("Error releasing place.");
 			logger.debug("Error releasing place.");
 		}
 		}
+
+		place = placebean.find(place.getId());
 		return null;
 		return null;
 	}
 	}
 
 
@@ -231,11 +235,11 @@ public class PlaceView extends GenericCDIView {
 		return searchuser;
 		return searchuser;
 	}
 	}
 
 
-	public void setUserlist(ListDataModel<User> userlist) {
+	public void setUserlist(ListDataModel<EventUser> userlist) {
 		this.userlist = userlist;
 		this.userlist = userlist;
 	}
 	}
 
 
-	public ListDataModel<User> getUserlist() {
+	public ListDataModel<EventUser> getUserlist() {
 		return userlist;
 		return userlist;
 	}
 	}