File tree Expand file tree Collapse file tree 2 files changed +12
-3
lines changed
src/projects/detail/components Expand file tree Collapse file tree 2 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ import DeletePhase from './DeletePhase'
2323import {
2424 ROLE_CONNECT_ADMIN ,
2525 ROLE_ADMINISTRATOR ,
26- } from '../../../../../ config/constants'
26+ } from '../../../../config/constants'
2727
2828const moment = extendMoment ( Moment )
2929const phaseStatuses = PHASE_STATUS . map ( ps => ( {
@@ -87,7 +87,7 @@ class EditStageForm extends React.Component {
8787 componentWillReceiveProps ( nextProps ) {
8888 this . setState ( {
8989 isUpdating : nextProps . isUpdating ,
90- isEdittable : nextProps . phase . status !== PHASE_STATUS_COMPLETED ,
90+ isEdittable : nextProps . phase . status !== PHASE_STATUS_COMPLETED || nextProps . isAdmin ,
9191 disableActiveStatusFields : nextProps . phase . status !== PHASE_STATUS_ACTIVE ,
9292 } )
9393
Original file line number Diff line number Diff line change @@ -118,7 +118,16 @@ class Milestone extends React.Component {
118118
119119 updateMilestoneWithData ( values ) {
120120 const { milestone, updateMilestone } = this . props
121- updateMilestone ( milestone . id , values )
121+ let milestoneData = {
122+ ...values
123+ } ;
124+ if ( values . actualStartDate ) {
125+ milestoneData . actualStartDate = moment . utc ( new Date ( values . actualStartDate ) )
126+ }
127+ if ( values . completionDate ) {
128+ milestoneData . completionDate = moment . utc ( new Date ( values . completionDate ) )
129+ }
130+ updateMilestone ( milestone . id , milestoneData )
122131 }
123132
124133 milestoneEditorChanged ( values ) {
You can’t perform that action at this time.
0 commit comments