Merge pull request #1661 from appirio-tech/dev

gondzo · web-flow · commit d20634e4e8d1 · 2018-02-01T20:54:04.000+01:00
fix discussions
diff --git a/src/projects/detail/ProjectDetail.jsx b/src/projects/detail/ProjectDetail.jsx
@@ -48,7 +48,7 @@ class ProjectDetail extends Component {
     this.props.loadProjectDashboard(projectId)
   }
 
-  componentWillReceiveProps({isProcessing, isLoading, error, project, match, location}) {
+  componentWillReceiveProps({isProcessing, isLoading, error, project, match}) {
     // handle just deleted projects
     if (! (error || isLoading || isProcessing) && _.isEmpty(project))
       this.props.history.push('/projects/')
@@ -61,10 +61,7 @@ class ProjectDetail extends Component {
       this.props.loadProjectDashboard(match.params.projectId)
     }
 
-    // reload project details if navigating by Link to same page
-    if (this.props.location.key !== location.key) {
-      this.props.loadProjectDashboard(match.params.projectId)
-    }
+    
   }
 
   getProjectRoleForCurrentUser({currentUserId, project}) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class ProjectDetail extends Component {`
`48`	`48`	`this.props.loadProjectDashboard(projectId)`
`49`	`49`	`}`
`50`	`50`
`51`		`- componentWillReceiveProps({isProcessing, isLoading, error, project, match, location}) {`
	`51`	`+ componentWillReceiveProps({isProcessing, isLoading, error, project, match}) {`
`52`	`52`	`// handle just deleted projects`
`53`	`53`	`if (! (error \|\| isLoading \|\| isProcessing) && _.isEmpty(project))`
`54`	`54`	`this.props.history.push('/projects/')`
`@@ -61,10 +61,7 @@ class ProjectDetail extends Component {`
`61`	`61`	`this.props.loadProjectDashboard(match.params.projectId)`
`62`	`62`	`}`
`63`	`63`
`64`		`- // reload project details if navigating by Link to same page`
`65`		`- if (this.props.location.key !== location.key) {`
`66`		`- this.props.loadProjectDashboard(match.params.projectId)`
`67`		`- }`
	`64`	`+`
`68`	`65`	`}`
`69`	`66`
`70`	`67`	`getProjectRoleForCurrentUser({currentUserId, project}) {`