From 0ff0b2e2aad16c717bd3723dd2059aa172f2d2d4 Mon Sep 17 00:00:00 2001
From: cyril lopez <cyril.lpz@gmail.com>
Date: Sat, 16 Dec 2017 12:26:47 +0100
Subject: [PATCH] Fix ctm editview backheader

---
 .../admin/src/containers/Edit/index.js                     | 6 ++++--
 .../admin/src/containers/List/index.js                     | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
index 76dc4bbc86..9df4be78f7 100755
--- a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
@@ -131,9 +131,11 @@ export class Edit extends React.Component {
   componentWillReceiveProps(nextProps) {
     if (this.props.editSuccess !== nextProps.editSuccess) {
       if (!isEmpty(this.props.location.search) && includes(this.props.location.search, '?redirectUrl')) {
+        const redirectUrl = this.props.location.search.split('?redirectUrl=')[1];
+
         router.push({
-          pathname: replace(this.props.location.search, '?redirectUrl=', ''),
-          search: `?source=${this.source}`,
+          pathname: redirectUrl.split('?')[0],
+          search: redirectUrl.split('?')[1],
         });
       } else {
         router.push({
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
index c749812d12..1bd3da387c 100755
--- a/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/List/index.js
@@ -89,6 +89,7 @@ export class List extends React.Component {
   init(props) {
     const source = getQueryParameters(props.location.search, 'source');
     const slug = props.match.params.slug;
+
     // Set current model name
     this.props.setCurrentModelName(slug.toLowerCase());
 
@@ -97,8 +98,8 @@ export class List extends React.Component {
       getQueryParameters('sort')) || 'id';
 
     if (!isEmpty(props.location.search)) {
-      this.props.changePage(toInteger(getQueryParameters('page')), source);
-      this.props.changeLimit(toInteger(getQueryParameters('limit')), source);
+      this.props.changePage(toInteger(getQueryParameters(props.location.search, 'page')), source);
+      this.props.changeLimit(toInteger(getQueryParameters(props.location.search, 'limit')), source);
     }
 
     this.props.changeSort(sort, source);
@@ -191,7 +192,7 @@ export class List extends React.Component {
         history={this.props.history}
         primaryKey={currentModel.primaryKey || 'id'}
         handleDelete={this.toggleModalWarning}
-        redirectUrl={`?redirectUrl=/plugins/content-manager/${this.props.currentModelName.toLowerCase()}/?page=${this.props.currentPage}&limit=${this.props.limit}&sort=${this.props.sort}&source=${source}`}
+        redirectUrl={`?redirectUrl=/plugins/content-manager/${this.props.currentModelName.toLowerCase()}?page=${this.props.currentPage}&limit=${this.props.limit}&sort=${this.props.sort}&source=${source}`}
       />
     );