Skip to content

Commit e8c8ba6

Browse files
authored
Merge pull request #2918 from appirio-tech/hotfix/copilot_access_check_fixes
[HOTFIX-Master]Fixed copilots access for milestones. GitIssue#2917
2 parents 4b8e270 + e143a77 commit e8c8ba6

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/projects/detail/components/ProjectStage.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ class ProjectStage extends React.Component{
226226
/>
227227

228228
{currentActiveTab === 'timeline' &&
229-
<ProductTimelineContainer product={product} />
229+
<ProductTimelineContainer product={product} project={project} />
230230
}
231231

232232
{currentActiveTab === 'posts' && (

src/projects/detail/components/timeline/Milestone/Milestone.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ class Milestone extends React.Component {
199199
milestone,
200200
currentUser,
201201
previousMilestone,
202+
project
202203
} = this.props
203204
const { isEditing, isMobileEditing } = this.state
204205

@@ -314,7 +315,7 @@ class Milestone extends React.Component {
314315
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
315316
{(matches) => (matches ? (
316317
<div styleName={'desktop-edit-section'}>
317-
{checkPermission(PERMISSIONS.EDIT_PROJECT_PLAN) && !isCompleted && this.state.isHoverHeader && !isUpdating &&
318+
{checkPermission(PERMISSIONS.EDIT_PROJECT_PLAN, project) && !isCompleted && this.state.isHoverHeader && !isUpdating &&
318319
(<div onClick={this.toggleEditLink} styleName={'post-edit'} >
319320
<span styleName="tooltiptext">Edit milestone properties</span>
320321
</div>)
@@ -323,7 +324,7 @@ class Milestone extends React.Component {
323324
) : (
324325
<div styleName={'mobile-edit-section'}>
325326
{
326-
checkPermission(PERMISSIONS.EDIT_PROJECT_PLAN) && !isCompleted && !isUpdating &&
327+
checkPermission(PERMISSIONS.EDIT_PROJECT_PLAN, project) && !isCompleted && !isUpdating &&
327328
(<div onClick={this.toggleMobileEditLink} styleName={'post-edit-mobile'} />)
328329
}
329330
</div>

src/projects/detail/components/timeline/Timeline/Timeline.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ class Timeline extends React.Component {
9797
timeline,
9898
isLoading,
9999
phaseId,
100+
project,
100101
} = this.props
101102

102103
if (isLoading || _.some(timeline.milestones, 'isUpdating')) {
@@ -130,6 +131,7 @@ class Timeline extends React.Component {
130131
//$TODO convert the below logic more optimized way
131132
previousMilestone={_.find(orderedMilestones, m => m.order === milestone.order-1) &&
132133
_.find(orderedMilestones, m => m.order === milestone.order-1).type}
134+
project={project}
133135
/>
134136
))}
135137
</div>

0 commit comments

Comments
 (0)