Merge branch 'master' of codecrew.fi:bortal

code/LanBortalWeb/WebContent/useradmin/list.xhtml

@@ -45,10 +45,11 @@
 						<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />
 					</h:panelGroup>
 					<h:panelGroup>
-						<a style="display: #{((userCartView.isEmpty())?'block':'none')};" onclick="$('#usercart').show(); $(this).hide();"><h:outputText value="#{i18n['userlist.showAdvancedSearch']}" /></a>
+						<a style="display: #{((userCartView.isEmpty())?'block':'none')};" onclick="$('#usercart').show(); $(this).hide();"><h:outputText value="#{i18n['usercart.showCart']}" /></a>
 						<div id="usercart" style="display: #{((userCartView.isEmpty())?'none':'block')};">
 							<h:outputText value="#{i18n['usercart.cartsize']}" />
 							<h:outputText value=" #{userCartView.userCartSize}" />
+							<h:commandButton action="#{userCartView.clearCart}" value="#{i18n['usercart.clear']}" />
 							<br />
 							<h:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearcherUsers']}" />
 							<h:commandButton action="#{userCartView.traverse}" value="#{i18n['usercart.traverse']}" />

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserCartView.java

@@ -26,12 +26,12 @@ public class UserCartView extends GenericCDIView {
 
 	private List<EventUser> usercart;
 
-	public void initView()
-	{
+	public void initView() {
 
 	}
 
-	private static final Logger logger = LoggerFactory.getLogger(UserCartView.class);
+	private static final Logger logger = LoggerFactory
+			.getLogger(UserCartView.class);
 
 	public String next() {
 		++current;
@@ -45,37 +45,34 @@ public class UserCartView extends GenericCDIView {
 		return null;
 	}
 
-	public String getUserCartSize()
-	{
+	public String getUserCartSize() {
 		String ret = "0";
-		if (usercart != null)
-		{
+		if (usercart != null) {
 			ret = Integer.toString(usercart.size());
 		}
 		return ret;
 	}
 
-	public String removeCurrent()
-	{
+	public String removeCurrent() {
 		EventUser removed = usercart.remove(current.intValue());
 		logger.debug("Removed idx {} from usercart {}", current, removed);
 
-		if (!usercart.isEmpty())
-		{
+		if (!usercart.isEmpty()) {
 			updateCurrent();
 		}
 		return null;
 	}
 
-	public String traverse()
-	{
-		current = 0;
-		updateCurrent();
-		return "/useradmin/userCartShow";
+	public String traverse() {
+		if (usercart != null) {
+			current = 0;
+			updateCurrent();
+			return "/useradmin/userCartShow";
+		}
+		else return "/useradmin/list";
 	}
 
-	public String saveUser()
-	{
+	public String saveUser() {
 		userview.saveUser();
 		return null;
 	}
@@ -84,14 +81,12 @@ public class UserCartView extends GenericCDIView {
 		logger.debug("Updating current user to {}", current);
 		if (current >= usercart.size()) {
 			current = usercart.size() - 1;
-		} else if (current < 0)
-		{
+		} else if (current < 0) {
 			current = 0;
 		}
 		EventUser u = usercart.get(current);
 		logger.debug("usercart current {}, got {}", current, u);
-		if (u != null)
-		{
+		if (u != null) {
 			userview.setUserid(u.getUser().getId());
 			userview.setUser(null);
 			userview.initView();
@@ -99,8 +94,7 @@ public class UserCartView extends GenericCDIView {
 	}
 
 	public void addUsers(List<EventUser> results) {
-		if (usercart == null)
-		{
+		if (usercart == null) {
 			usercart = new ArrayList<EventUser>();
 		}
 		usercart.removeAll(results);
@@ -108,8 +102,13 @@ public class UserCartView extends GenericCDIView {
 
 	}
 
-	public boolean isEmpty()
-	{
+	public void clearCart() {
+		if (usercart != null)
+			usercart.clear();
+		//return null;
+	}
+	
+	public boolean isEmpty() {
 		return usercart == null || usercart.isEmpty();
 	}