Skip to content

Hotfix/unable to activate v2 projects #2907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 3 commits into from
Mar 14, 2019
Merged

Hotfix/unable to activate v2 projects #2907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80261f1
Github issue#2904, Unable to set status to Active for Old projects (v2)
Mar 14, 2019
8cedb9c
Github issue#2905, Unable to active v3 projects from GridView of proj…
Mar 14, 2019
1170985
Merge branch 'master' into hotfix/unable_to_activate_v2_projects
Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/ProjectInfo/ProjectInfo.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion src/projects/list/components/Projects/ProjectsGridView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 (
<div className="spacing">
<EnhancedProjectStatus
Expand All @@ -206,6 +213,7 @@ const ProjectsGridView = props => {
unifiedHeader={false}
onChangeStatus={onChangeStatus}
projectId={item.id}
projectCanBeActive={projectCanBeActive}
/>
</div>
)
Expand Down