1.1 --- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Fri Sep 04 20:26:48 2009 +0200
1.2 +++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java Fri Sep 04 21:14:33 2009 +0200
1.3 @@ -169,15 +169,20 @@
1.4 if (v != null) {
1.5 return v;
1.6 }
1.7 - Object obj =
1.8 - base.path("games").queryParam("white", white).
1.9 - queryParam("black", black).post(Document.class);
1.10 - return welcome();
1.11 +
1.12 + if (user.equals(white) || user.equals(black)) {
1.13 + Object obj =
1.14 + base.path("games").queryParam("white", white).
1.15 + queryParam("black", black).post(Document.class);
1.16 + return welcomeImpl();
1.17 + } else {
1.18 + return welcomeImpl("message", "You (" + user + ") must be white or black!");
1.19 + }
1.20 }
1.21
1.22 - private Viewable welcomeImpl() {
1.23 + private Viewable welcomeImpl(Object... args) {
1.24 final Document got = base.path("games").accept(MediaType.TEXT_XML).get(Document.class);
1.25 - return viewable("index.fmt", got);
1.26 + return viewable("index.fmt", got, args);
1.27 }
1.28
1.29 //