Skip to content

[new milestone concept] fix issue #4428, #4432 #4434

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
elkhawajah merged 1 commit into from
Jul 26, 2021
Merged

[new milestone concept] fix issue #4428, #4432 #4434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class ManageMilestones extends React.Component {
<col style={{ width: '11%' }} />{/* END DATE */}
<col style={{ width: '10%' }} />{/* STATUS */}
<col style={{ width: '12%' }} />{/* BUDGET */}
<col style={{ width: '13%' }} />{/* COPILOTS */}
{/* <col style={{ width: '13%' }} /> */}{/* COPILOTS */}
{isUpdatable && (<col style={{ width: '80px' }} />)}{/* ACTION */}
</colgroup>
<thead>
Expand Down
7 changes: 4 additions & 3 deletions src/projects/detail/containers/DashboardContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,10 @@ class DashboardContainer extends React.Component {
</div>
) : (
<div styleName="simple-plan">
{((!hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN) && (!visiblePhases || visiblePhases.length === 0))
{/* check if visiblePhases/phases is non-null and empty */}
{((!hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN) && (visiblePhases && visiblePhases.length === 0))
|| (hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN) &&
(!phases || phases.length === 0) &&
(phases && phases.length === 0) &&
(!this.state.createGameplanPhases || this.state.createGameplanPhases.length === 0))
) && (
<div styleName="welcome-message">
Expand All @@ -332,7 +333,7 @@ class DashboardContainer extends React.Component {
isCustomer={!hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN)}
project={project}
phases={phases}
milestones={this.state.createGameplanPhases || phases}
milestones={this.state.createGameplanPhases || visiblePhases || []}
onChangeMilestones={(milestones) => {
this.setState({createGameplanPhases: milestones})
}}
Expand Down