# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1257325621 -3600
# Node ID 8d5afaa13ee323f120b7148143858e5929514e86
# Parent  73b18c815499de70c3509b5ee936ec01811e9bb1# Parent  04f9d559b8a1363a7ccc5ab4c88156547265aec6
Merge: Don't display comments when there are none, test to find who wins, talk header without any link

diff -r 73b18c815499 -r 8d5afaa13ee3 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt	Tue Nov 03 23:51:36 2009 +0100
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt	Wed Nov 04 10:07:01 2009 +0100
@@ -237,7 +237,7 @@
           </tbody>
       </table>
 
-      <h3><a href="/games/${doc.game.id.@id}?move=0">${bundle.TALK}</a></h3>
+      <h3>${bundle.TALK}</h3>
 
       <ul>
       <#list doc.game.moves.item.comment as item>
diff -r 73b18c815499 -r 8d5afaa13ee3 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt	Tue Nov 03 23:51:36 2009 +0100
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt	Wed Nov 04 10:07:01 2009 +0100
@@ -55,7 +55,9 @@
       <#macro game game>
           ${bundle("gameWhiteBlack", game.@white?string, game.@black?string)} 
           <a href="/games/${game.@id}/"><@before (now - game.@modified?number)?int/></a>
-          ${bundle("comments", game.@comments?number)}
+          <#if game.@comments?number != 0>
+            ${bundle("comments", game.@comments?number)}
+          </#if>
           <#assign printed = printed + 1/>
       </#macro>
 
diff -r 73b18c815499 -r 8d5afaa13ee3 webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java
--- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java	Tue Nov 03 23:51:36 2009 +0100
+++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java	Wed Nov 04 10:07:01 2009 +0100
@@ -135,6 +135,8 @@
         Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
         assertEquals("BlackWins", GameStatus.blackWon, end.getId().getStatus());
 
+        assertEquals("Jirka wins", "Jirka", end.getCurrentPlayer());
+
         List<GameId> something = webResource.path("games/").queryParam("status", "blackWon").accept(MediaType.TEXT_XML).get(gType);
 
         assertEquals("One game finished: " + something, 1, something.size());
@@ -157,6 +159,7 @@
             queryParam("move", "RESIGN").put(GameId.class);
         Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
         assertEquals("BlackWins", GameStatus.blackWon, end.getId().getStatus());
+        assertEquals("Jirka wins", "Jirka", end.getCurrentPlayer());
     }
 
 }