[SDESK-2078] Rrestrict assignment actions if related-content is locked

superdesk · Nov 29, 2017 · 94e1f62 · 94e1f62
1 parent cedd41e
commit 94e1f62
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/client/components/AssignmentItem/index.jsx b/client/components/AssignmentItem/index.jsx
@@ -60,12 +60,13 @@ export const AssignmentItem = ({
         },
     ]
 
-    const itemActions = inAssignments ? assignmentUtils.getAssignmentItemActions(
-        assignment,
-        session,
-        privileges,
-        actions
-    ) : []
+    const itemActions = inAssignments && !isItemLocked ?
+        assignmentUtils.getAssignmentItemActions(
+            assignment,
+            session,
+            privileges,
+            actions
+        ) : []
 
     const isAssignmentInUse = assignmentUtils.isAssignmentInUse(assignment)
 

diff --git a/client/components/AssignmentPreviewContainer/index.jsx b/client/components/AssignmentPreviewContainer/index.jsx
@@ -50,9 +50,12 @@ class AssignmentPreviewContainerComponent extends React.Component {
             privileges,
             startWorking,
             removeAssignment,
+            lockedItems,
         } = this.props
 
-        if (!inAssignments) {
+        const isItemLocked = get(lockedItems, 'assignments') && assignment._id in lockedItems.assignments
+
+        if (!inAssignments || isItemLocked) {
             return []
         }
 
@@ -288,7 +291,7 @@ AssignmentPreviewContainerComponent.propTypes = {
     keywords: PropTypes.array,
     contentTypes: PropTypes.array,
     formProfile: PropTypes.object,
-
+    lockedItems: PropTypes.array,
     newsCoverageStatus: PropTypes.array,
 }
 
@@ -311,6 +314,7 @@ const mapStateToProps = (state) => ({
     contentTypes: get(state, 'vocabularies.g2_content_type', []),
     formProfile: selectors.getFormsProfile(state),
     newsCoverageStatus: selectors.getNewsCoverageStatus(state),
+    lockedItems: selectors.getLockedItems(state),
 })
 
 const mapDispatchToProps = (dispatch) => ({