Merge branch 'userid_bug' into 'master'

bugin paikannus

See merge request !436

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

@@ -163,9 +163,13 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	public PrintedCard checkPrintedCard(EventUser user) {
 		logger.info("Checking printed card");
 
+		if (user == null)
+			return null;
+
 		user = eventUserFacade.reload(user);
 		if (user == null)
 			return null;
+
 		LanEvent currEvent = eventBean.getCurrentEvent();
 		List<PrintedCard> myCards = printedcardfacade.getCards(user);
 

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java

@@ -197,7 +197,7 @@ public class IncomingView extends GenericCDIView {
 		showAttachDialog = false;
 
 		// refresh all shit, purkkaa!!
-		super.navihandler.redirectNavigation("incoming.jsf?userid=" + userview.getUser().getId());
+		super.navihandler.redirectNavigation("incoming.jsf?userid=" + userview.getUser().getUser().getId());
 
 		userview.setUser(null); // refresh user
 		userview.setPrintedCard(null); // refresh card

code/pom.xml

@@ -96,7 +96,7 @@
 	<repositories>
 		<repository>
 			<id>iudex</id>
-			<url>http://iudex.fi/maven/</url>
+			<url>https://iudex.fi/maven/</url>
 		</repository>
 		<repository>
 			<id>jvnet-nexus-releases</id>
@@ -110,11 +110,11 @@
 		</repository>
 		<repository>
 			<id>apache.snapshots</id>
-			<url>http://repository.apache.org/snapshots/</url>
+			<url>https://repository.apache.org/snapshots/</url>
 		</repository>
 		<repository>
 			<id>clojars.org</id>
-			<url>http://clojars.org/repo</url>
+			<url>https://clojars.org/repo</url>
 		</repository>