1)click Save or move to next row will save as Approved 2)tick/untick …

…will saved as Approved/Fuzzy, refuse to stay ticked when tick Approved on an empty cell
zanata · Aug 2, 2011 · 6eefb1a · 6eefb1a
1 parent ca0f367
commit 6eefb1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...ata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java b/...ata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
@@ -97,6 +97,7 @@ public void onClick(ClickEvent event)
    {
       public void onClick(ClickEvent event)
       {
+         cellValue.setStatus(ContentState.Approved);
          acceptEdit();
          // gotoNextRow(curRow);
       }
@@ -391,6 +392,7 @@ public void editCell(CellEditInfo cellEditInfo, TransUnit cellValue, Callback<Tr
       // save the content in previous cell before start new editing
       if (this.cellValue != null && curRow != cellEditInfo.getRowIndex())
       {
+         this.cellValue.setStatus(ContentState.Approved);
          Log.debug("save content of previous cell");
          acceptEdit();
       }

diff --git a/...anata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java b/...anata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
@@ -461,8 +461,13 @@ public void onToggleApproved(ToggleApprovedEvent event)
             int row = display.getCurrentPage() * display.getPageSize() + rowOffset;
             Log.info("toggle Approved for " + row);
             TransUnit rowValue = event.getTransUnit();
-            display.getTableModel().setRowValueOverride(row, rowValue);
+            if (rowValue.getStatus() == ContentState.Approved)
+            {
+               if (rowValue.getTarget().isEmpty())
+                  rowValue.setStatus(ContentState.New);
+            }
 
+            display.getTableModel().setRowValueOverride(row, rowValue);
             // save the Approved state when target cell editor is not opened
             // and target is not empty
             if (!rowValue.getTarget().isEmpty())
@@ -473,8 +478,7 @@ public void onToggleApproved(ToggleApprovedEvent event)
                }
                else
                {
-                  if (rowValue.getStatus() == ContentState.NeedReview)
-                     display.getTargetCellEditor().acceptEdit();
+                  display.getTargetCellEditor().acceptEdit();
                }
             }
          }