From 3760ed0ac0bd1b7f7d39a6a904382286c8769b52 Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 4 Feb 2020 09:41:22 +0100 Subject: [PATCH 1/5] test Signed-off-by: Virginie Ky --- yarn.lock | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5b8d1144ff..33c5bea0f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12299,22 +12299,6 @@ node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-pre-gyp@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" @@ -17169,7 +17153,7 @@ tar-stream@^2.1.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: +tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== From 0bd50b47f6dfa5f9d63678f37c5d30150c28400d Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 4 Feb 2020 14:19:45 +0100 Subject: [PATCH 2/5] back button url fix Signed-off-by: Virginie Ky --- packages/strapi-admin/admin/src/components/Logout/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/strapi-admin/admin/src/components/Logout/index.js b/packages/strapi-admin/admin/src/components/Logout/index.js index fe206cbacf..f148aa6e9a 100644 --- a/packages/strapi-admin/admin/src/components/Logout/index.js +++ b/packages/strapi-admin/admin/src/components/Logout/index.js @@ -27,8 +27,7 @@ const Logout = ({ history: { push } }) => { push({ pathname: `/plugins/content-manager/strapi::administrator/${id}`, - search: - '?redirectUrl=/plugins/content-manager/strapi::administrator/&_page=0&_limit=0&_sort=id', + search: '?redirectUrl=/plugins/content-manager/strapi::administrator', }); }; const handleGoToAdministrator = () => { From c3ce67b418d15951d7f974ebcad5afcdb3121e02 Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 4 Feb 2020 15:32:37 +0100 Subject: [PATCH 3/5] Revert "back button url fix" This reverts commit fd11d655d7e73e7796a8ebf4759c3c6658f19011. Signed-off-by: Virginie Ky --- packages/strapi-admin/admin/src/components/Logout/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/strapi-admin/admin/src/components/Logout/index.js b/packages/strapi-admin/admin/src/components/Logout/index.js index f148aa6e9a..fe206cbacf 100644 --- a/packages/strapi-admin/admin/src/components/Logout/index.js +++ b/packages/strapi-admin/admin/src/components/Logout/index.js @@ -27,7 +27,8 @@ const Logout = ({ history: { push } }) => { push({ pathname: `/plugins/content-manager/strapi::administrator/${id}`, - search: '?redirectUrl=/plugins/content-manager/strapi::administrator', + search: + '?redirectUrl=/plugins/content-manager/strapi::administrator/&_page=0&_limit=0&_sort=id', }); }; const handleGoToAdministrator = () => { From d429e54070ae8a86c58cd50cb0327b0c7ad05a09 Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 4 Feb 2020 15:32:40 +0100 Subject: [PATCH 4/5] Revert "test" This reverts commit fea644818c2ae2fd81e5307671142b400f4557ef. Signed-off-by: Virginie Ky --- yarn.lock | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 33c5bea0f0..5b8d1144ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12299,6 +12299,22 @@ node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-pre-gyp@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" @@ -17153,7 +17169,7 @@ tar-stream@^2.1.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: +tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== From a31b63187fec5d8554aabe027f56d460ac34a5b0 Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 4 Feb 2020 15:36:10 +0100 Subject: [PATCH 5/5] administrator back button url Signed-off-by: Virginie Ky --- packages/strapi-admin/admin/src/components/Logout/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/strapi-admin/admin/src/components/Logout/index.js b/packages/strapi-admin/admin/src/components/Logout/index.js index fe206cbacf..f148aa6e9a 100644 --- a/packages/strapi-admin/admin/src/components/Logout/index.js +++ b/packages/strapi-admin/admin/src/components/Logout/index.js @@ -27,8 +27,7 @@ const Logout = ({ history: { push } }) => { push({ pathname: `/plugins/content-manager/strapi::administrator/${id}`, - search: - '?redirectUrl=/plugins/content-manager/strapi::administrator/&_page=0&_limit=0&_sort=id', + search: '?redirectUrl=/plugins/content-manager/strapi::administrator', }); }; const handleGoToAdministrator = () => {