From 4133322f826ed3bf5ee4659ac43008c4397151d6 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 24 Jan 2021 19:23:31 +0100 Subject: [PATCH 1/4] Add some more commands to make TravisCI work See: https://travis-ci.org/github/phpmyadmin/phpmyadmin/jobs/755890381#L990 Signed-off-by: William Desportes --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d00c9b8b98..071627e39e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ install: script: - ./scripts/generate-mo --quiet - composer run phpunit -- --exclude-group selenium + - echo 'The testsuite did run.' + - sleep 1 cache: pip: true From 8c977454f06cf209ba95087a9c7601f7d91c6a32 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 24 Jan 2021 14:54:20 +0100 Subject: [PATCH 2/4] Add readthedocs build badge Signed-off-by: William Desportes --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 21efade85f..199efaddf9 100644 --- a/README.rst +++ b/README.rst @@ -16,6 +16,10 @@ Code status :alt: Build status :target: https://travis-ci.org/phpmyadmin/phpmyadmin +.. image:: https://readthedocs.org/projects/phpmyadmin/badge/?version=qa_5_1 + :target: https://docs.phpmyadmin.net/en/qa_5_1/ + :alt: Documentation build status + .. image:: https://hosted.weblate.org/widgets/phpmyadmin/-/5-1/svg-badge.svg :alt: Translation status :target: https://hosted.weblate.org/engage/phpmyadmin/?utm_source=widget From 657f83ac59a18eb9f84377a53764913089b36def Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 24 Jan 2021 22:43:06 +0100 Subject: [PATCH 3/4] Allow Windows TravisCI to fail + fixes The build is failing after on of my recent changes, to find out I pushed a commit but the builds are still not working. That said the tests run fine, it is just TravisCI not working. I am allowing failure in order to have Selenium tests to run. Also disabling cache because it could by why the Windows build fails Signed-off-by: William Desportes --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 071627e39e..fa34f39d20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,9 @@ install: script: - ./scripts/generate-mo --quiet - - composer run phpunit -- --exclude-group selenium - - echo 'The testsuite did run.' - - sleep 1 + - ./vendor/bin/phpunit --exclude-group selenium cache: - pip: true yarn: true directories: - $HOME/.composer/cache/ @@ -26,6 +23,7 @@ jobs: allow_failures: - php: nightly - os: osx + - os: windows # https://github.com/phpmyadmin/phpmyadmin/issues/16479 - name: "Run selenium tests on Google Chrome" @@ -57,6 +55,7 @@ jobs: os: windows language: node_js node_js: 10 + cache: false install: - composer install --no-interaction --ignore-platform-reqs before_install: From e33a19ff70f61d0f2dd3579b8ebcb9eed8abecbd Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 25 Jan 2021 00:15:46 +0100 Subject: [PATCH 4/4] Add server number on navigation tree requests to solve logged out I was logged out on one of my servers of my list But not the first one. Steps: - login - navigation auto unfolds a database (request is missing server number) - logged out Signed-off-by: William Desportes --- js/src/navigation.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/src/navigation.js b/js/src/navigation.js index a0b5304988..50ed373363 100644 --- a/js/src/navigation.js +++ b/js/src/navigation.js @@ -136,6 +136,7 @@ Navigation.loadChildNodes = function (isNode, $expandElem, callback) { var pos2Name = $expandElem.find('span.pos2_nav'); var pathsNav = $expandElem.find('span.paths_nav'); params = { + 'server': CommonParams.get('server'), 'aPath': pathsNav.attr('data-apath'), 'vPath': pathsNav.attr('data-vpath'), 'pos': pathsNav.attr('data-pos'), @@ -151,6 +152,7 @@ Navigation.loadChildNodes = function (isNode, $expandElem, callback) { } else { $destination = $('#pma_navigation_tree_content'); params = { + 'server': CommonParams.get('server'), 'aPath': $expandElem.attr('data-apath'), 'vPath': $expandElem.attr('data-vpath'), 'pos': $expandElem.attr('data-pos'),