Merge branch 'insomnia_2014' of codecrew.fi:codecrew/moya into insomnia_2014

code/moya-web/pom.xml

@@ -35,6 +35,12 @@
 			<version>5.1</version>
 			<version>5.1</version>
 		</dependency>
 		</dependency>
 
 
+			<dependency>
+				<groupId>org.primefaces.extensions</groupId>
+				<artifactId>all-themes</artifactId>
+				<version>1.0.8</version>
+				<type>pom</type>
+			</dependency>
 	</dependencies>
 	</dependencies>
 	<parent>
 	<parent>
 		<groupId>fi.codecrew.moya</groupId>
 		<groupId>fi.codecrew.moya</groupId>

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

@@ -272,15 +272,18 @@ public class IncomingView extends GenericCDIView {
 	 * @return Card filing info String or empty string.
 	 * @return Card filing info String or empty string.
 	 */
 	 */
 	public String getCardFiling() {
 	public String getCardFiling() {
+		String ret = "";
 		try {
 		try {
 			PrintedCard card = cardBean.checkPrintedCard(userview.getSelectedUser());
 			PrintedCard card = cardBean.checkPrintedCard(userview.getSelectedUser());
+			if (card != null) {
 				JsonObject cardMeta = card.getMeta();
 				JsonObject cardMeta = card.getMeta();
 				JsonObject cardFilingObject = cardMeta.getJsonObject("card-filing");
 				JsonObject cardFilingObject = cardMeta.getJsonObject("card-filing");
-			return cardFilingObject.getString("cardplace");
+				ret = cardFilingObject.getString("cardplace");
+			}
 		} catch (Exception e) {
 		} catch (Exception e) {
 			logger.warn("Could not get card filing info", e);
 			logger.warn("Could not get card filing info", e);
 		}
 		}
-		return "";
+		return ret;
 	}
 	}
 
 
 	public String printCard() {
 	public String printCard() {