From 80261f1a5c2efbb8d5c426802264d782266d6662 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 14 Mar 2019 14:51:39 +0530 Subject: [PATCH 1/2] =?UTF-8?q?Github=20issue#2904,=20Unable=20to=20set=20?= =?UTF-8?q?status=20to=20Active=20for=20Old=20projects=20(v2)=20=E2=80=94?= =?UTF-8?q?=20Should=20fix=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProjectInfo/ProjectInfo.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/ProjectInfo/ProjectInfo.jsx b/src/components/ProjectInfo/ProjectInfo.jsx index 319e8ffd2..9c4f1cb7b 100644 --- a/src/components/ProjectInfo/ProjectInfo.jsx +++ b/src/components/ProjectInfo/ProjectInfo.jsx @@ -53,7 +53,9 @@ class ProjectInfo extends Component { const activePhases = phases ? phases.filter((phase) => phase.status === PHASE_STATUS_ACTIVE) : [] const hasReviewedOrActivePhases = !!_.find(phases, (phase) => _.includes([PHASE_STATUS_REVIEWED, PHASE_STATUS_ACTIVE], phase.status)) - const projectCanBeActive = (project.status !== PROJECT_STATUS_ACTIVE && hasReviewedOrActivePhases) || project.status === PROJECT_STATUS_ACTIVE + const isProjectActive = project.status === PROJECT_STATUS_ACTIVE + const isV3Project = project.version === 'v3' + const projectCanBeActive = (isV3Project && !isProjectActive && hasReviewedOrActivePhases) || isProjectActive // prepare review button From 8cedb9c0f2246a6c8b30afbcba87645b239505a8 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 14 Mar 2019 14:55:55 +0530 Subject: [PATCH 2/2] =?UTF-8?q?Github=20issue#2905,=20Unable=20to=20active?= =?UTF-8?q?=20v3=20projects=20from=20GridView=20of=20projects=20listing=20?= =?UTF-8?q?page=20=E2=80=94=20Should=20fix=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../list/components/Projects/ProjectsGridView.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/projects/list/components/Projects/ProjectsGridView.jsx b/src/projects/list/components/Projects/ProjectsGridView.jsx index 3640e15cf..5f43c93ad 100644 --- a/src/projects/list/components/Projects/ProjectsGridView.jsx +++ b/src/projects/list/components/Projects/ProjectsGridView.jsx @@ -11,7 +11,10 @@ import ProjectListTimeSortColHeader from './ProjectListTimeSortColHeader' import ProjectListFilterColHeader from './ProjectListFilterColHeader' import GridView from '../../../../components/Grid/GridView' import UserTooltip from '../../../../components/User/UserTooltip' -import { PROJECTS_LIST_PER_PAGE, SORT_OPTIONS, PROJECT_STATUS_COMPLETED, DATE_TO_USER_FIELD_MAP } from '../../../../config/constants' +import { + PROJECTS_LIST_PER_PAGE, SORT_OPTIONS, PROJECT_STATUS_COMPLETED, DATE_TO_USER_FIELD_MAP, PHASE_STATUS_REVIEWED, + PHASE_STATUS_ACTIVE +} from '../../../../config/constants' import { getProjectTemplateByKey } from '../../../../helpers/templates' import TextTruncate from 'react-text-truncate' import ProjectStatus from '../../../../components/ProjectStatus/ProjectStatus' @@ -196,6 +199,10 @@ const ProjectsGridView = props => { classes: 'item-status', renderText: item => { const canEdit = item.status !== PROJECT_STATUS_COMPLETED + const hasReviewedOrActivePhases = !!_.find(item.phases, (phase) => _.includes([PHASE_STATUS_REVIEWED, PHASE_STATUS_ACTIVE], phase.status)) + const isProjectActive = item.status === PROJECT_STATUS_ACTIVE + const isV3Project = item.version === 'v3' + const projectCanBeActive = (isV3Project && !isProjectActive && hasReviewedOrActivePhases) || isProjectActive return (
{ unifiedHeader={false} onChangeStatus={onChangeStatus} projectId={item.id} + projectCanBeActive={projectCanBeActive} />
)