rhbz867167 - translation history clear selection for each text flow

zanata · Oct 17, 2012 · 4496731 · 4496731
1 parent 8ff0af7
commit 4496731
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/...a-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java b/...a-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
@@ -85,17 +85,17 @@ public void onSuccess(GetTranslationHistoryResult result)
 
    protected void popupAndShowLoading(String title)
    {
-
+      //here we CANNOT use listDataProvider.setList() because we need to retain the same list reference which is used by ColumnSortEvent.ListHandler
+      listDataProvider.getList().clear();
       listDataProvider.setLoading(true);
+      selectionModel.clear();
       display.setTitle(title);
       display.resetView();
       display.center();
    }
 
    protected void displayEntries(TransHistoryItem latest, List<TransHistoryItem> otherEntries)
    {
-      //here we CANNOT use listDataProvider.setList() because we need to retain the same list reference which is used by ColumnSortEvent.ListHandler
-      listDataProvider.getList().clear();
       if (latest != null)
       {
          //add indicator for latest version

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
@@ -348,7 +348,7 @@ public interface WebTransMessages extends Messages
    @DefaultMessage("User")
    String modifiedBy();
 
-   @DefaultMessage("Modified Date")
+   @DefaultMessage("Date")
    String modifiedDate();
 
    @DefaultMessage("Paste into Editor")

diff --git a/...r/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java b/...r/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
@@ -134,6 +134,7 @@ public void willNotifyErrorAndHideTranslationHistoryOnFailure()
       // Then:
       verify(dataProvider).setLoading(true);
       verify(display).setTitle("translation history");
+      verify(selectionModel).clear();
       verify(display).resetView();
       verify(display).center();
       assertThat(actionCaptor.getValue().getTransUnitId(), Matchers.equalTo(transUnitId));
@@ -150,6 +151,7 @@ public void willNotifyErrorAndHideTranslationHistoryOnFailure()
    public void willShowTranslationHistoryOnSuccess()
    {
       // Given: text flow has one history item and one latest translation
+      when(messages.translationHistory()).thenReturn("translation history");
       TransHistoryItem historyItem = historyItem("1");
       String latestVersion = "2";
       TransHistoryItem latest = historyItem(latestVersion);
@@ -161,6 +163,11 @@ public void willShowTranslationHistoryOnSuccess()
       presenter.showTranslationHistory(transUnitId);
 
       // Then:on success
+      verify(dataProvider).setLoading(true);
+      verify(display).setTitle("translation history");
+      verify(selectionModel).clear();
+      verify(display).resetView();
+      verify(display).center();
       AsyncCallback<GetTranslationHistoryResult> result = resultCaptor.getValue();
       result.onSuccess(createTranslationHistory(latest, historyItem));
       MatcherAssert.assertThat(dataProvider.getList(), Matchers.contains(latest, historyItem));