Enable review feature in editor

https://bugzilla.redhat.com/show_bug.cgi?id=1211134 Squashed commit of the following: commit 31e5a14 Merge: ec95d13 ee7b454 Author: Alex Eng <aeng@redhat.com> Date: Tue May 19 13:15:28 2015 +1000 Merge branch 'integration/master' into rhbz1211134 commit ec95d13 Merge: 4f401de a149bba Author: Alex Eng <aeng@redhat.com> Date: Tue May 19 13:14:38 2015 +1000 Merge branch 'integration/master' into rhbz1211134 commit 4f401de Author: Alex Eng <aeng@redhat.com> Date: Mon May 18 14:28:04 2015 +1000 Enable review feature in editor: https://bugzilla.redhat.com/show_bug.cgi?id=1211134
zanata · May 20, 2015 · 575aa29 · 575aa29
1 parent cac3875
commit 575aa29
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 28 deletions.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -43,6 +43,7 @@ Example usage in html file: `<link rel="shortcut icon" href="#{assets['img/logo/
     * File project type now supports XLIFF, PROPERTIES, PROPERTIES_UTF8, and GETTEXT
 * [1204982](https://bugzilla.redhat.com/show_bug.cgi?id=1204982) - Documentation update for zanata.org/help + readthedocs 
 * [1209670](https://bugzilla.redhat.com/show_bug.cgi?id=1209670) - Improve review statistics - approved vs translated
+* [1211134](https://bugzilla.redhat.com/show_bug.cgi?id=1211134) - Review should be enabled in editor by default
 * [1198433](https://bugzilla.redhat.com/show_bug.cgi?id=1198433) - Replace Seam Text with CommonMark Markdown
     * User text on the home page and project "about" pages will now be rendered as CommonMark.
     * Existing Seam Text will be migrated to CommonMark where possible.

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
@@ -647,8 +647,7 @@ public UserConfigHolder.ConfigurationState getConfigState() {
     public boolean canReview() {
         WorkspaceRestrictions restrictions =
                 userWorkspaceContext.getWorkspaceRestrictions();
-        return restrictions.isHasReviewAccess()
-                && restrictions.isProjectRequireReview();
+        return restrictions.isHasReviewAccess();
     }
 
     @Override

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
@@ -330,9 +330,7 @@ private Widget getStatsWidget(DocumentInfo docInfo, boolean statsByWords) {
         FlowPanel panel = new FlowPanel();
         final TransUnitCountBar graph =
                 new TransUnitCountBar(userWorkspaceContext, messages,
-                        LabelFormat.PERCENT_COMPLETE, false,
-                        userWorkspaceContext.getWorkspaceRestrictions()
-                                .isProjectRequireReview());
+                        LabelFormat.PERCENT_COMPLETE, false);
         Image loading = new Image(resources.spinner());
         panel.add(graph);
         panel.add(loading);

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
@@ -60,7 +60,7 @@ interface TooltipPopupPanelUiBinder extends
     Grid grid;
 
     @Inject
-    public TooltipPopupPanel(boolean projectRequireReview) {
+    public TooltipPopupPanel() {
         super(true);
         HTMLPanel container = uiBinder.createAndBindUi(this);
         setStyleName(style.transUnitCountTooltip());

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
@@ -68,7 +68,7 @@ interface TransUnitCountBarUiBinder extends
     @Inject
     public TransUnitCountBar(UserWorkspaceContext userworkspaceContext,
             WebTransMessages messages, LabelFormat labelFormat,
-            boolean enableClickToggle, boolean projectRequireReview) {
+            boolean enableClickToggle) {
         this.messages = messages;
         if (labelFormat != null) {
             this.labelFormat = labelFormat;
@@ -79,7 +79,7 @@ public TransUnitCountBar(UserWorkspaceContext userworkspaceContext,
                 userworkspaceContext.getWorkspaceContext().getWorkspaceId()
                         .getLocaleId();
 
-        tooltipPanel = new TooltipPopupPanel(projectRequireReview);
+        tooltipPanel = new TooltipPopupPanel();
 
         initWidget(uiBinder.createAndBindUi(this));
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
@@ -152,9 +152,7 @@ public AppView(WebTransMessages messages,
         this.messages = messages;
         translationStatsBar =
                 new TransUnitCountBar(userWorkspaceContext, messages,
-                        LabelFormat.PERCENT_COMPLETE_HRS, true,
-                        userWorkspaceContext.getWorkspaceRestrictions()
-                                .isProjectRequireReview());
+                        LabelFormat.PERCENT_COMPLETE_HRS, true);
         translationStatsBar.setVisible(false); // hide until there is a value to
 
         projectLink =

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
@@ -132,12 +132,11 @@ public ActivateWorkspaceResult execute(ActivateWorkspaceAction action,
         boolean isProjectObsolete = isProjectIterationObsolete(project.getStatus(), projectIteration.getStatus());
         boolean hasWriteAccess = hasWritePermission(project, locale);
         boolean hasGlossaryUpdateAccess = hasGlossaryUpdatePermission();
-        boolean requireReview = projectIteration.getRequireTranslationReview();
         boolean hasReviewAccess = hasReviewerPermission(locale, project);
 
         WorkspaceRestrictions workspaceRestrictions =
                 new WorkspaceRestrictions(isProjectActive, isProjectObsolete, hasWriteAccess,
-                        hasGlossaryUpdateAccess, hasReviewAccess, requireReview);
+                        hasGlossaryUpdateAccess, hasReviewAccess);
         log.debug("workspace restrictions: {}", workspaceRestrictions);
 
         LoadOptionsResult loadOptsRes =

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
@@ -13,21 +13,19 @@ public class WorkspaceRestrictions implements IsSerializable {
     private boolean hasEditTranslationAccess;
     private boolean hasReviewAccess;
     private boolean hasGlossaryUpdateAccess;
-    private boolean projectRequireReview;
 
     @SuppressWarnings("unused")
     private WorkspaceRestrictions() {
     }
 
     public WorkspaceRestrictions(boolean projectActive, boolean projectObsolete,
             boolean hasEditTranslationAccess, boolean hasGlossaryUpdateAccess,
-            boolean hasReviewAccess, boolean projectRequireReview) {
+            boolean hasReviewAccess) {
         this.isProjectActive = projectActive;
         this.isProjectObsolete = projectObsolete;
         this.hasEditTranslationAccess = hasEditTranslationAccess;
         this.hasGlossaryUpdateAccess = hasGlossaryUpdateAccess;
         this.hasReviewAccess = hasReviewAccess;
-        this.projectRequireReview = projectRequireReview;
     }
 
     public boolean isProjectActive() {
@@ -50,33 +48,29 @@ public boolean isHasReviewAccess() {
         return hasReviewAccess;
     }
 
-    public boolean isProjectRequireReview() {
-        return projectRequireReview;
-    }
-
     public WorkspaceRestrictions changeProjectActivity(boolean projectActive) {
         return new WorkspaceRestrictions(projectActive, isProjectObsolete,
                 hasEditTranslationAccess, hasGlossaryUpdateAccess,
-                hasReviewAccess, projectRequireReview);
+                hasReviewAccess);
     }
 
     public WorkspaceRestrictions changeProjectObsolescence(boolean projectObsolete) {
         return new WorkspaceRestrictions(isProjectActive, projectObsolete,
                 hasEditTranslationAccess, hasGlossaryUpdateAccess,
-                hasReviewAccess, projectRequireReview);
+                hasReviewAccess);
     }
 
     public WorkspaceRestrictions changeEditTranslationAccess(
             boolean hasEditTranslationAccess) {
         return new WorkspaceRestrictions(isProjectActive, isProjectObsolete,
                 hasEditTranslationAccess, hasGlossaryUpdateAccess,
-                hasReviewAccess, projectRequireReview);
+                hasReviewAccess);
     }
 
     public WorkspaceRestrictions changeReviewAccess(boolean hasReviewAccess) {
         return new WorkspaceRestrictions(isProjectActive, isProjectObsolete,
                 hasEditTranslationAccess, hasGlossaryUpdateAccess,
-                hasReviewAccess, projectRequireReview);
+                hasReviewAccess);
     }
 
     @Override
@@ -87,7 +81,6 @@ public String toString() {
             add("hasEditTranslationAccess", hasEditTranslationAccess).
             add("hasGlossaryUpdateAccess", hasGlossaryUpdateAccess).
             add("hasReviewAccess", hasReviewAccess).
-            add("projectRequireReview", projectRequireReview).
             toString();
       // @formatter:on
     }

diff --git a/zanata-war/src/test/java/org/zanata/model/TestFixture.java b/zanata-war/src/test/java/org/zanata/model/TestFixture.java
@@ -122,7 +122,7 @@ public static UserWorkspaceContext userWorkspaceContext(
                 new ProjectIterationId(projectSlug, iterationSlug, projectType);
         WorkspaceRestrictions workspaceRestrictions =
                 new WorkspaceRestrictions(projectActive, false, hasWriteAccess, true,
-                        true, true);
+                        true);
         return new UserWorkspaceContext(new WorkspaceContext(new WorkspaceId(
                 projectIterationId, LocaleId.EN_US), "workspaceName",
                 LocaleId.EN_US.getId()), workspaceRestrictions);
@@ -132,7 +132,7 @@ public static UserWorkspaceContext userWorkspaceContext(
             boolean projectActive, boolean hasWriteAccess) {
         WorkspaceRestrictions workspaceRestrictions =
                 new WorkspaceRestrictions(projectActive, false, hasWriteAccess, true,
-                        true, true);
+                        true);
         return new UserWorkspaceContext(new WorkspaceContext(workspaceId(),
                 "workspaceName", LocaleId.EN_US.getId()), workspaceRestrictions);
     }

diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
@@ -45,7 +45,7 @@ public void execute() {
                 new WorkspaceContext(action.getWorkspaceId(),
                         "Dummy Workspace", "Mock Sweedish");
         WorkspaceRestrictions workspaceRestrictions =
-                new WorkspaceRestrictions(true, false, true, true, true, true);
+                new WorkspaceRestrictions(true, false, true, true, true);
         UserWorkspaceContext userWorkspaceContext =
                 new UserWorkspaceContext(context, workspaceRestrictions);
         userWorkspaceContext.setSelectedDoc(new DocumentInfo(new DocumentId(