Merge pull request neos#1727 from neos/dimaip/safe-discard

BUGFIX: don't allow to publish/discard while publishing/discarding/saving
theDex · Mar 30, 2018 · 65517f5 · 65517f5
2 parents 1f5b705 + bb83499
commit 65517f5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/neos-ui/src/Containers/PrimaryToolbar/PublishDropDown/index.js b/packages/neos-ui/src/Containers/PrimaryToolbar/PublishDropDown/index.js
@@ -90,6 +90,8 @@ export default class PublishDropDown extends PureComponent {
             publishableNodes,
             publishableNodesInDocument,
             isSaving,
+            isPublishing,
+            isDiscarding,
             isAutoPublishingEnabled,
             isWorkspaceReadOnly,
             toggleAutoPublishing,
@@ -102,8 +104,8 @@ export default class PublishDropDown extends PureComponent {
         const workspaceModuleUri = $get('routes.core.modules.workspaces', neos);
         const allowedWorkspaces = $get('configuration.allowedTargetWorkspaces', neos);
         const baseWorkspaceTitle = $get([baseWorkspace, 'title'], allowedWorkspaces);
-        const canPublishLocally = publishableNodesInDocument && (publishableNodesInDocument.count() > 0);
-        const canPublishGlobally = publishableNodes && (publishableNodes.count() > 0);
+        const canPublishLocally = !isSaving && !isPublishing && !isDiscarding && publishableNodesInDocument && (publishableNodesInDocument.count() > 0);
+        const canPublishGlobally = !isSaving && !isPublishing && !isDiscarding && publishableNodes && (publishableNodes.count() > 0);
         const changingWorkspaceAllowed = !canPublishGlobally;
         const autoPublishWrapperClassNames = mergeClassNames({
             [style.dropDown__item]: true,