Merge pull request #1078 from nrvikas/SDESK-3657

[SDESK-3657] Allow news-coverage-status to be editable if it is a draft coverage
superdesk · Nov 26, 2018 · 4235943 · 4235943
2 parents c2461b4 + 1d799bc
commit 4235943
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/client/components/Coverages/CoverageEditor/CoverageForm.jsx b/client/components/Coverages/CoverageEditor/CoverageForm.jsx
@@ -207,7 +207,7 @@ export class CoverageForm extends React.Component {
                     defaultValue={planningUtils.defaultCoverageValues(newsCoverageStatus).news_coverage_status}
                     options={newsCoverageStatus}
                     {...fieldProps}
-                    readOnly={!!get(value, 'assigned_to.desk', readOnly)}
+                    readOnly={roFields.newsCoverageStatus}
                 />
 
                 <Field

diff --git a/client/utils/planning.js b/client/utils/planning.js
@@ -573,16 +573,13 @@ const getCoverageReadOnlyFields = (
         };
     }
 
-    const hasAssignment = !!get(coverage, 'assigned_to.assignment_id');
-    const isCancelled = get(newsCoverageStatus, 'qcode') ===
-        PLANNING.NEWS_COVERAGE_CANCELLED_STATUS.qcode;
-
     // State is either derived from the Assignment state or if the coverage is cancelled
     let state = null;
 
-    if (hasAssignment) {
+    if (get(coverage, 'assigned_to.assignment_id')) {
         state = get(coverage, 'assigned_to.state');
-    } else if (isCancelled) {
+    } else if (get(newsCoverageStatus, 'qcode') ===
+            PLANNING.NEWS_COVERAGE_CANCELLED_STATUS.qcode) {
         state = ASSIGNMENTS.WORKFLOW_STATE.CANCELLED;
     }
 
@@ -641,7 +638,7 @@ const getCoverageReadOnlyFields = (
             internal_note: readOnly,
             g2_content_type: readOnly,
             genre: readOnly,
-            newsCoverageStatus: readOnly || hasAssignment,
+            newsCoverageStatus: readOnly,
             scheduled: readOnly,
         };
     }