Skip to content

Commit e0c9d45

Browse files
author
vikasrohit
authored
Merge pull request #2912 from appirio-tech/hotfix/unable_to_activate_v2_project_part_2
Hotfix/unable to activate v2 project part 2
2 parents 804f89c + 8a20f61 commit e0c9d45

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

.circleci/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ workflows:
110110
jobs:
111111
- build-dev:
112112
context : org-global
113-
filters:
114-
branches:
115-
only: ['dev', 'dev-msinteg', 'feature/form-redesign']
116113

117114
- build-prod:
118115
context : org-global

src/components/ProjectInfo/ProjectInfo.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ProjectInfo extends Component {
5555
const hasReviewedOrActivePhases = !!_.find(phases, (phase) => _.includes([PHASE_STATUS_REVIEWED, PHASE_STATUS_ACTIVE], phase.status))
5656
const isProjectActive = project.status === PROJECT_STATUS_ACTIVE
5757
const isV3Project = project.version === 'v3'
58-
const projectCanBeActive = (isV3Project && !isProjectActive && hasReviewedOrActivePhases) || isProjectActive
58+
const projectCanBeActive = !isV3Project || (!isProjectActive && hasReviewedOrActivePhases) || isProjectActive
5959

6060

6161
// prepare review button

src/projects/list/components/Projects/ProjectsGridView.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ const ProjectsGridView = props => {
202202
const hasReviewedOrActivePhases = !!_.find(item.phases, (phase) => _.includes([PHASE_STATUS_REVIEWED, PHASE_STATUS_ACTIVE], phase.status))
203203
const isProjectActive = item.status === PROJECT_STATUS_ACTIVE
204204
const isV3Project = item.version === 'v3'
205-
const projectCanBeActive = (isV3Project && !isProjectActive && hasReviewedOrActivePhases) || isProjectActive
205+
const projectCanBeActive = !isV3Project || (!isProjectActive && hasReviewedOrActivePhases) || isProjectActive
206206
return (
207207
<div className="spacing">
208208
<EnhancedProjectStatus

0 commit comments

Comments
 (0)