From ca9ef2025d28a78a5b5b929cd6971447bfd7c283 Mon Sep 17 00:00:00 2001 From: Kyeong Su Shin Date: Sun, 10 Jan 2016 01:48:07 +0100 Subject: [PATCH 1/3] Translated using Weblate (Korean) Currently translated at 79.2% (2545 of 3210 strings) [CI skip] --- po/ko.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index 2ea19cecfd..771f2c6058 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.3-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-12-16 07:59+0100\n" -"PO-Revision-Date: 2016-01-08 04:55+0000\n" +"PO-Revision-Date: 2016-01-10 01:48+0000\n" "Last-Translator: Kyeong Su Shin \n" "Language-Team: Korean " "\n" @@ -2782,7 +2782,7 @@ msgstr "초" #: js/messages.php:776 msgid "This field is required" -msgstr "해당 항목은 필수 항목입니다." +msgstr "해당 항목은 필수 항목입니다" #: js/messages.php:777 msgid "Please fix this field" From 04cf33fcfe4144e6830ea793b832570fabab062b Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Sun, 10 Jan 2016 10:10:52 +0100 Subject: [PATCH 2/3] Translated using Weblate (Slovak) Currently translated at 83.8% (2693 of 3210 strings) [CI skip] --- po/sk.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/sk.po b/po/sk.po index 45cc491901..6fb983233e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.3-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-12-16 07:59+0100\n" -"PO-Revision-Date: 2015-12-21 23:48+0000\n" +"PO-Revision-Date: 2016-01-10 10:10+0000\n" "Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" @@ -8376,10 +8376,9 @@ msgstr "" "zároveň spôsobiť problémy s transakciami.)" #: libraries/display_import.lib.php:309 -#, fuzzy #| msgid "Number of rows to skip, starting from the first row:" msgid "Skip this number of queries (for SQL) starting from the first one:" -msgstr "Počet riadkov od začiatku, ktoré sa majú preskočiť:" +msgstr "Počet dopytov od začiatku (pre SQL) , ktoré sa majú preskočiť:" #: libraries/display_import.lib.php:339 msgid "Other options:" @@ -11015,12 +11014,14 @@ msgid "" msgstr "" #: libraries/relation.lib.php:1923 -#, fuzzy, php-format +#, php-format #| msgid "Missing phpMyAdmin configuration storage tables" msgid "" "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin " "configuration storage there." -msgstr "Chýbajú tabuľky pre miesto uloženia phpMyAdmin konfigurácie" +msgstr "" +"%sVytvoriť%s databázu s názvom 'phpmyadmin' a nastaviť tam miesto uloženia " +"phpMyAdmin konfigurácie." #: libraries/relation.lib.php:1931 #, php-format @@ -12436,7 +12437,6 @@ msgstr "" "%sznovunačítanie práv%s predtým ako budete pokračovať." #: libraries/server_privileges.lib.php:4700 -#, fuzzy #| msgid "" #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's " #| "privilege tables. The content of these tables may differ from the " @@ -12451,8 +12451,8 @@ msgid "" msgstr "" "Poznámka: phpMyAdmin získava práva používateľov priamo z tabuliek MySQL. " "Obsah týchto tabuliek sa môže líšiť od práv, ktoré používa server, ak boli " -"tieto tabuľky ručne upravené. V tomto prípade sa odporúča vykonať " -"%sznovunačítanie práv%s predtým ako budete pokračovať." +"tieto tabuľky ručne upravené. V tom prípade je potrebné znovu načítanie " +"práv. Nemáte oprávnenie na RELOAD ." #: libraries/server_privileges.lib.php:4750 msgid "The selected user was not found in the privilege table." From 5a54fb1ee1e1d80575d8e01fee30e4cbb6c8eee3 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 11 Jan 2016 08:42:55 +1100 Subject: [PATCH 3/3] Fix #11772 Table pagination does nothing when session expired Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/ajax.js | 14 +------------- js/functions.js | 21 +++++++++++++++++++++ js/navigation.js | 3 ++- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59b7e9d87a..f50cbefdbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - issue #11826 Fix creating/editing VIEW with DEFINER containing special chars - issue #11828 Do not invoke FLUSH PRIVILEGES when server in --skip-grant-tables - issue #11804 Misleading message for configuration storage +- issue #11772 Table pagination does nothing when session expired 4.5.3.1 (2015-12-25) - issue #11774 Undefined offset 2 diff --git a/js/ajax.js b/js/ajax.js index d047173ea9..f24971a8da 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -488,19 +488,7 @@ var AJAX = { PMA_ajaxShowMessage(data.error, false); AJAX.active = false; AJAX.xhr = null; - if (parseInt(data.redirect_flag) == 1) { - // add one more GET param to display session expiry msg - if (window.location.href.indexOf('?') === -1) { - window.location.href += '?session_expired=1'; - } else { - window.location.href += '&session_expired=1'; - } - window.location.reload(); - } else if (parseInt(data.reload_flag) == 1) { - // remove the token param and reload - window.location.href = window.location.href.replace(/&?token=[^&#]*/g, ""); - window.location.reload(); - } + PMA_handleRedirectAndReload(data); if (data.fieldWithError) { $(':input.error').removeClass("error"); $('#'+data.fieldWithError).addClass("error"); diff --git a/js/functions.js b/js/functions.js index e3b192d049..2f30de4163 100644 --- a/js/functions.js +++ b/js/functions.js @@ -92,6 +92,27 @@ $.ajaxPrefilter(function (options, originalOptions, jqXHR) { } }); +/** + * Hanle redirect and reload flags send as part of AJAX requests + * + * @param data ajax response data + */ +function PMA_handleRedirectAndReload(data) { + if (parseInt(data.redirect_flag) == 1) { + // add one more GET param to display session expiry msg + if (window.location.href.indexOf('?') === -1) { + window.location.href += '?session_expired=1'; + } else { + window.location.href += '&session_expired=1'; + } + window.location.reload(); + } else if (parseInt(data.reload_flag) == 1) { + // remove the token param and reload + window.location.href = window.location.href.replace(/&?token=[^&#]*/g, ""); + window.location.reload(); + } +} + /** * Creates an SQL editor which supports auto completing etc. * diff --git a/js/navigation.js b/js/navigation.js index 12601f385f..2851ad48db 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -961,8 +961,8 @@ function PMA_navigationTreePagination($this) { } } $.post(url, params, function (data) { - PMA_ajaxRemoveMessage($msgbox); if (typeof data !== 'undefined' && data.success) { + PMA_ajaxRemoveMessage($msgbox); if (isDbSelector) { var val = PMA_fastFilter.getSearchClause(); $('#pma_navigation_tree') @@ -992,6 +992,7 @@ function PMA_navigationTreePagination($this) { } } else { PMA_ajaxShowMessage(data.error); + PMA_handleRedirectAndReload(data); } navTreeStateUpdate(); });