Git October 2011

git@phpmyadmin.net

6 participants
164 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21956-gf6dd17b
by Rouslan Placella 31 Oct '11

31 Oct '11

The branch, master has been updated via f6dd17bb94e041f0913dd594bf54f43662aa6b83 (commit) via 8812aeb7e25476313b9c07a90bebdf586a0dd443 (commit) via 2a14fdec556a78a5682f57625611831f381c63e2 (commit) from 00576dc1bb97e9f94a4658218e6957b2154c25f0 (commit) - Log ----------------------------------------------------------------- commit f6dd17bb94e041f0913dd594bf54f43662aa6b83 Merge: 8812aeb 00576dc Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Oct 31 18:48:16 2011 +0000 Merge remote-tracking branch 'origin/master' commit 8812aeb7e25476313b9c07a90bebdf586a0dd443 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Oct 30 20:44:23 2011 +0000 Fixed initialisation of makegrid in database search results commit 2a14fdec556a78a5682f57625611831f381c63e2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Oct 30 20:41:35 2011 +0000 Scroll to results after clicking "Browse" in database search ----------------------------------------------------------------------- Summary of changes: db_search.php | 1 + js/db_search.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/db_search.php b/db_search.php index da4863f..041242f 100644 --- a/db_search.php +++ b/db_search.php @@ -16,6 +16,7 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'db_search.js'; $GLOBALS['js_include'][] = 'sql.js'; $GLOBALS['js_include'][] = 'makegrid.js'; +$GLOBALS['js_include'][] = 'jquery/timepicker.js'; /** * Gets some core libraries and send headers diff --git a/js/db_search.js b/js/db_search.js index d6a42ff..d787290 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -37,11 +37,15 @@ function loadResult(result_path, table_name, link, ajaxEnable) $('#table-link').attr({"href" : 'sql.php?'+link }).text(table_name); var url = result_path + " #sqlqueryresults"; $('#browse-results').load(url, null, function() { + $('html, body') + .animate({ + scrollTop: $("#browse-results").offset().top + }, 1000); PMA_ajaxRemoveMessage($msg); // because under db_search, window.parent.table is not defined yet, // we assign it manually from #table-link window.parent.table = $('#table-link').text().trim(); - $('#table_results').makegrid(); + PMA_makegrid($('#table_results')[0], true, true, true, true); }).show(); } else { event.preventDefault(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21953-g00576dc
by Marc Delisle 31 Oct '11

31 Oct '11

The branch, master has been updated via 00576dc1bb97e9f94a4658218e6957b2154c25f0 (commit) via 028e9ee6d94fc42337d2e37941dc35ee3f91de86 (commit) via a691fce64ca56c90d0d4b9af525a785d95eabd6b (commit) from b47803b05c1058751d21563155c9927a8146f3c8 (commit) - Log ----------------------------------------------------------------- commit 00576dc1bb97e9f94a4658218e6957b2154c25f0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 31 12:36:45 2011 -0400 Fix merge conflicts commit 028e9ee6d94fc42337d2e37941dc35ee3f91de86 Merge: b47803b a691fce Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 31 12:35:12 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import/ods.php | 3 --- libraries/import/xml.php | 3 --- 3 files changed, 1 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a23a65e..682b45b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ phpMyAdmin - ChangeLog - bug #3426840 [interface] ENUM/SET editor can't handle commas in values - bug #3427256 [interface] no links to browse/empty views and tables - bug #3430377 [interface] Deleted search results remain visible +- bug #3428627 [import] ODS import ignores memory limits 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/libraries/import/ods.php b/libraries/import/ods.php index b6857d5..ab9729b 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -35,9 +35,6 @@ if (isset($plugin_list)) { return; } -@ini_set('memory_limit', '128M'); -@set_time_limit(120); - $i = 0; $len = 0; $buffer = ""; diff --git a/libraries/import/xml.php b/libraries/import/xml.php index 65f99bd..a3768cd 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -28,9 +28,6 @@ if (isset($plugin_list)) { return; } -@ini_set('memory_limit', '128M'); -@set_time_limit(120); - $i = 0; $len = 0; $buffer = ""; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-8-ga691fce
by Marc Delisle 31 Oct '11

31 Oct '11

The branch, QA_3_4 has been updated via a691fce64ca56c90d0d4b9af525a785d95eabd6b (commit) from f7cb55cb626158d81ac606927142d8f55444b9ff (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import/ods.php | 3 --- libraries/import/xml.php | 3 --- 3 files changed, 1 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 904e529..f852519 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #3426840 [interface] ENUM/SET editor can't handle commas in values - bug #3427256 [interface] no links to browse/empty views and tables - bug #3430377 [interface] Deleted search results remain visible +- bug #3428627 [import] ODS import ignores memory limits 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 4bf5200..d50bee9 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -35,9 +35,6 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '128M'); -set_time_limit(120); - $i = 0; $len = 0; $buffer = ""; diff --git a/libraries/import/xml.php b/libraries/import/xml.php index 640aac8..36af788 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -28,9 +28,6 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '128M'); -set_time_limit(120); - $i = 0; $len = 0; $buffer = ""; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21950-gb47803b
by Michal Čihař 31 Oct '11

31 Oct '11

The branch, master has been updated via b47803b05c1058751d21563155c9927a8146f3c8 (commit) via 7ee5394b3c25b68d344086314d6f7c6c102a4544 (commit) via 1f9a7c633fbdd36b4649242b61b3f3392b5f5cfe (commit) via 6ff2bd2bd8b8b47e749816625f7ee8e4a5ff898d (commit) via 04afb0d2661532665c35e5cc6c44b22b3d53e8bc (commit) via 2959f1e76c0bde6269472ab0c074005613a7b6ef (commit) via e5b45ade41ed6a8735c838d4b18a50592f60787f (commit) via fbb1d77c8b2bafff2105d55eaa7384a53448a5bd (commit) via 122fcea363e3acd8ce89848c301a83fa1ff6ebe0 (commit) via c1b82cb210ed972a9e9a90684f12070c0971071a (commit) from ad9ba4e6113bfb59c1700081695f52fc3db7cda0 (commit) - Log ----------------------------------------------------------------- commit b47803b05c1058751d21563155c9927a8146f3c8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 31 10:01:49 2011 +0100 Cleanup po files commit 7ee5394b3c25b68d344086314d6f7c6c102a4544 Merge: ad9ba4e 1f9a7c6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 31 10:01:29 2011 +0100 Merge remote-tracking branch 'pootle/master' Conflicts: po/hu.po po/ja.po commit 1f9a7c633fbdd36b4649242b61b3f3392b5f5cfe Author: Balázs Úr <urbalazs(a)gmail.com> Date: Sat Oct 29 01:35:30 2011 +0200 Translation update done using Pootle. commit 6ff2bd2bd8b8b47e749816625f7ee8e4a5ff898d Author: Balázs Úr <urbalazs(a)gmail.com> Date: Sat Oct 29 00:44:27 2011 +0200 Translation update done using Pootle. commit 04afb0d2661532665c35e5cc6c44b22b3d53e8bc Author: Balázs Úr <urbalazs(a)gmail.com> Date: Sat Oct 29 00:43:53 2011 +0200 Translation update done using Pootle. commit 2959f1e76c0bde6269472ab0c074005613a7b6ef Author: Balázs Úr <urbalazs(a)gmail.com> Date: Sat Oct 29 00:43:06 2011 +0200 Translation update done using Pootle. commit e5b45ade41ed6a8735c838d4b18a50592f60787f Author: Balázs Úr <urbalazs(a)gmail.com> Date: Sat Oct 29 00:42:26 2011 +0200 Translation update done using Pootle. commit fbb1d77c8b2bafff2105d55eaa7384a53448a5bd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 28 11:58:43 2011 +0200 Translation update done using Pootle. commit 122fcea363e3acd8ce89848c301a83fa1ff6ebe0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 28 11:55:53 2011 +0200 Translation update done using Pootle. commit c1b82cb210ed972a9e9a90684f12070c0971071a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 28 11:18:02 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/be.po | 1 - po/be(a)latin.po | 1 - po/cy.po | 1 - po/et.po | 1 - po/gl.po | 1 - po/hr.po | 1 - po/hu.po | 123 +++++++++++++++++++++++++------------------------------- po/ja.po | 9 ++-- po/ka.po | 1 - po/mn.po | 1 - po/pl.po | 1 - po/ro.po | 1 - po/sr.po | 1 - po/sr(a)latin.po | 1 - po/te.po | 1 - po/ug.po | 1 - po/uz.po | 1 - po/uz(a)latin.po | 1 - 18 files changed, 60 insertions(+), 88 deletions(-) diff --git a/po/be.po b/po/be.po index 7261011..a8f3fdd 100644 --- a/po/be.po +++ b/po/be.po @@ -13447,7 +13447,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Стварыць табліцу" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index e66122d..7e67d6e 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -13422,7 +13422,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Stvaryć tablicu" diff --git a/po/cy.po b/po/cy.po index 0a4d611..9c2b280 100644 --- a/po/cy.po +++ b/po/cy.po @@ -12829,7 +12829,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Crëwch dabl" diff --git a/po/et.po b/po/et.po index 8fb738a..9dc6803 100644 --- a/po/et.po +++ b/po/et.po @@ -13307,7 +13307,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Loo tabel" diff --git a/po/gl.po b/po/gl.po index 5bb7a07..adcae2a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13895,7 +13895,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Crear táboas" diff --git a/po/hr.po b/po/hr.po index ae62120..2c7d2c8 100644 --- a/po/hr.po +++ b/po/hr.po @@ -13403,7 +13403,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Izradi tablicu" diff --git a/po/hu.po b/po/hu.po index 17c2340..623750d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-30 05:35-0400\n" -"PO-Revision-Date: 2011-05-27 18:52+0200\n" -"Last-Translator: <slygyor(a)gmail.com>\n" +"PO-Revision-Date: 2011-10-29 00:44+0200\n" +"Last-Translator: Balázs Úr <urbalazs(a)gmail.com>\n" "Language-Team: hungarian <hu(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,7 +105,7 @@ msgstr "Nincs blob streaming szerver beállítva!" #: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" -msgstr "Fejlécek betöltése sikertelen." +msgstr "Fejlécek betöltése sikertelen" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" @@ -117,8 +117,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" -"A %s fájl nem elérhető ezen a rendszeren, keresse fel a www.phpmyadmin.net -" -"et további információkért." +"A(z) %s fájl nem elérhető ezen a rendszeren, keresse fel a " +"www.phpmyadmin.net oldalt további információkért." #: db_create.php:60 #, php-format @@ -914,12 +914,12 @@ msgstr "" #: gis_data_editor.php:173 gis_data_editor.php:197 gis_data_editor.php:245 #: gis_data_editor.php:297 js/messages.php:293 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:199 gis_data_editor.php:247 #: gis_data_editor.php:299 js/messages.php:294 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:296 @@ -3689,7 +3689,7 @@ msgstr "SQL kompatibilitási mód" #: libraries/config/messages.inc.php:124 libraries/export/sql.php:190 msgid "<code>CREATE TABLE</code> options:" -msgstr "" +msgstr "<code>CREATE TABLE</code> beállítások:" #: libraries/config/messages.inc.php:125 msgid "Creation/Update/Check dates" @@ -5863,41 +5863,41 @@ msgid "Importing into the current server" msgstr "Nem lehet bejelentkezni a MySQL szerverre" #: libraries/display_import.lib.php:131 -#, fuzzy, php-format +#, php-format, php-format msgid "Importing into the database \"%s\"" -msgstr "Nincs adatbázis" +msgstr "Importálás a(z) \"%s\" adatbázisba" #: libraries/display_import.lib.php:133 -#, fuzzy, php-format +#, php-format, php-format msgid "Importing into the table \"%s\"" -msgstr "Nincs adatbázis" +msgstr "Importálás a(z) \"%s\" táblába" #: libraries/display_import.lib.php:139 -#, fuzzy #| msgid "File to import" msgid "File to Import:" -msgstr "Importálandó fájl" +msgstr "Az importálandó fájl:" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "A fájl lehet tömörített (%s) vagy tömörítetlen." #: libraries/display_import.lib.php:158 msgid "" "A compressed file's name must end in .[format].[compression]. " "Example: .sql.zip" msgstr "" +"A tömörített fájl nevének .[formátum].[tömörítés] végződésűnek kell " +"lennie. Például: .sql.zip" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." msgstr "Ezen a szerveren a fájlfeltöltések nem engedélyezettek." #: libraries/display_import.lib.php:208 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Részleges importálás" +msgstr "Részleges importálás:" #: libraries/display_import.lib.php:214 #, php-format @@ -5930,7 +5930,7 @@ msgstr "Az elejétől kihagyandó rekordok (lekérdezések) száma" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" -msgstr "" +msgstr "Formátum specifikus beállítások:" #: libraries/display_select_lang.lib.php:46 #: libraries/display_select_lang.lib.php:47 setup/frames/index.inc.php:72 @@ -6591,7 +6591,6 @@ msgstr "Sorok vége" #: libraries/export/csv.php:28 libraries/export/excel.php:23 #: libraries/export/htmlword.php:29 libraries/export/latex.php:80 #: libraries/export/ods.php:24 libraries/export/odt.php:60 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" msgstr "NULL cseréje ezzel:" @@ -6611,10 +6610,9 @@ msgstr "Excel szerkesztés" #: libraries/export/htmlword.php:28 libraries/export/latex.php:70 #: libraries/export/odt.php:56 libraries/export/sql.php:222 #: libraries/export/texytext.php:26 libraries/export/xml.php:73 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Az adatbázisok megjelenítésének beállításai" +msgstr "Adatkiírási beállítások" #: libraries/export/htmlword.php:121 libraries/export/odt.php:161 #: libraries/export/sql.php:1187 libraries/export/texytext.php:109 @@ -6640,10 +6638,9 @@ msgstr "@TABLE@ tábla szerkezete" #: libraries/export/latex.php:48 libraries/export/odt.php:40 #: libraries/export/sql.php:142 -#, fuzzy #| msgid "Transformation options" msgid "Object creation options" -msgstr "Átalakítás beállításai" +msgstr "Objektum-létrehozási beállítások" #: libraries/export/latex.php:52 libraries/export/latex.php:76 #, fuzzy @@ -6659,17 +6656,15 @@ msgid "Display foreign key relationships" msgstr "Az idegen kulcsok ellenőrzésének letiltása" #: libraries/export/latex.php:60 libraries/export/odt.php:46 -#, fuzzy #| msgid "Displaying Column Comments" msgid "Display comments" -msgstr "Oszlopmegjegyzések megjelenítése" +msgstr "Megjegyzések megjelenítése" #: libraries/export/latex.php:63 libraries/export/odt.php:49 #: libraries/export/sql.php:63 -#, fuzzy #| msgid "Available MIME types" msgid "Display MIME types" -msgstr "Létező MIME-típusok" +msgstr "MIME-típusok megjelenítése" #: libraries/export/latex.php:129 libraries/export/sql.php:482 #: libraries/export/xml.php:131 libraries/header_printview.inc.php:59 @@ -6710,60 +6705,65 @@ msgid "(Generates a report containing the data of a single table)" msgstr "(Egyetlen táblázat adatait tartalmazó jelentést generál)" #: libraries/export/pdf.php:25 -#, fuzzy #| msgid "Report title" msgid "Report title:" -msgstr "A jelentés címe" +msgstr "A jelentés címe:" #: libraries/export/php_array.php:18 msgid "PHP array" -msgstr "" +msgstr "PHP tömb" #: libraries/export/sql.php:40 msgid "" "Display comments (includes info such as export timestamp, PHP version, " "and server version)" msgstr "" +"Megjegyzések megjelenítése (olyan információk, mint az exportálás " +"időbélyege, a PHP verziója és a szerver verziója)" #: libraries/export/sql.php:45 -#, fuzzy #| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" -msgstr "Egyéni megjegyzés hozzáadása a fejléchez (a \\n töri a sorokat)" +msgstr "További egyéni megjegyzés hozzáadása a fejléchez (a \\n töri a sorokat):" #: libraries/export/sql.php:50 msgid "" "Include a timestamp of when databases were created, last updated, and last " "checked" msgstr "" +"Tartalmazza azokat az időbélyegeket, amikor az adatbázis létrejött, utoljára " +"frissült és utoljára ellenőrizve lett" #: libraries/export/sql.php:100 msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" +"Adatbázis rendszer vagy régebbi MySQL szerver a kimenet kompatibilitásának " +"maximalizálása ezzel:" #: libraries/export/sql.php:114 libraries/export/sql.php:173 #: libraries/export/sql.php:180 -#, fuzzy, php-format +#, php-format, php-format #| msgid "Statements" msgid "Add %s statement" -msgstr "Utasítások" +msgstr "%s utasítások hozzáadása" #: libraries/export/sql.php:152 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Utasítások" +msgstr "Utasítások hozzáadása:" #: libraries/export/sql.php:211 msgid "" "Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" +"Tábla és oszlopnevek idézőjelek közé rakása (Védi az oszlop és tábla " +"neveket a speciális karakterektől vagy a kulcsszavaktól)" #: libraries/export/sql.php:231 msgid "Instead of <code>INSERT</code> statements, use:" -msgstr "" +msgstr "Az <code>INSERT</code> utasítás helyett használjon:" #: libraries/export/sql.php:238 msgid "<code>INSERT DELAYED</code> statements" @@ -6852,10 +6852,9 @@ msgid "Stand-in structure for view" msgstr "A nézet helyettes szerkezete" #: libraries/export/sql.php:1111 -#, fuzzy #| msgid "Allows reading data." msgid "Error reading data:" -msgstr "Engedélyezi az adatok olvasását." +msgstr "Hiba az adatolvasás közben:" #: libraries/export/xml.php:19 libraries/import/xml.php:21 msgid "XML" @@ -6863,13 +6862,12 @@ msgstr "XML" #: libraries/export/xml.php:34 msgid "Object creation options (all are recommended)" -msgstr "" +msgstr "Objektum-létrehozási beállítások (mindegyik javasolt)" #: libraries/export/xml.php:62 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "Nézet" +msgstr "Nézetek" #: libraries/export/xml.php:78 #, fuzzy @@ -7061,7 +7059,6 @@ msgid "" msgstr "" #: libraries/kanji-encoding.lib.php:147 -#, fuzzy #| msgid "None" msgctxt "None encoding conversion" msgid "None" @@ -7305,12 +7302,10 @@ msgstr "Kilépés" #: libraries/navigation_header.inc.php:115 #: libraries/navigation_header.inc.php:117 #: libraries/navigation_header.inc.php:119 -#, fuzzy msgid "Reload navigation frame" -msgstr "A navigációs keret testreszabása" +msgstr "A navigációs keret újratöltése" #: libraries/plugin_interface.lib.php:309 -#, fuzzy #| msgid "This format has no options" msgid "This format has no options" msgstr "Ennek a formátumnak nincsenek beállításai" @@ -7547,16 +7542,14 @@ msgstr "Hiba a kérés feldolgozásában" #: libraries/rte/rte_events.lib.php:371 libraries/rte/rte_routines.lib.php:828 #: libraries/rte/rte_triggers.lib.php:302 -#, fuzzy #| msgid "Details..." msgid "Details" -msgstr "Részletek..." +msgstr "Részletek" #: libraries/rte/rte_events.lib.php:374 -#, fuzzy #| msgid "Event type" msgid "Event name" -msgstr "Esemény típusa" +msgstr "Eseménynév" #: libraries/rte/rte_events.lib.php:395 server_binlog.php:182 msgid "Event type" @@ -8407,7 +8400,6 @@ msgid "Get more editing space" msgstr "" #: libraries/tbl_properties.inc.php:351 -#, fuzzy #| msgid "None" msgctxt "for default" msgid "None" @@ -8653,10 +8645,9 @@ msgstr "" "\")." #: libraries/user_preferences.inc.php:33 -#, fuzzy #| msgid "Other core settings" msgid "Manage your settings" -msgstr "Egyéb alapbeállítások" +msgstr "Beállítások kezelése" #: libraries/user_preferences.inc.php:50 prefs_manage.php:289 #, fuzzy @@ -8711,10 +8702,9 @@ msgid "Appearance Settings" msgstr "Egyéb alapbeállítások" #: main.php:144 prefs_manage.php:272 -#, fuzzy #| msgid "Other core settings" msgid "More settings" -msgstr "Egyéb alapbeállítások" +msgstr "További beállítások" #: main.php:158 #, fuzzy @@ -9140,23 +9130,21 @@ msgstr "Importálás a böngészőből" #: prefs_manage.php:246 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "A beállítások a böngészője helyi tárolójából lesznek importálva." #: prefs_manage.php:252 -#, fuzzy #| msgid "Other core settings" msgid "You have no saved settings!" -msgstr "Egyéb alapbeállítások" +msgstr "Nincsenek elmentett beállításai!" #: prefs_manage.php:256 prefs_manage.php:310 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "Az ön web böngészője nem támogatja ezt a szolgáltatást" #: prefs_manage.php:261 -#, fuzzy #| msgid "Server configuration" msgid "Merge with current configuration" -msgstr "Szerverbeállítások" +msgstr "Egyesítés a jelenlegi beállítással" #: prefs_manage.php:275 #, php-format @@ -9167,19 +9155,21 @@ msgstr "" #: prefs_manage.php:300 msgid "Save to browser's storage" -msgstr "" +msgstr "Mentés a böngésző tárolójába" #: prefs_manage.php:304 msgid "Settings will be saved in your browser's local storage." -msgstr "" +msgstr "A beállítások a böngészője helyi tárolójába lesznek mentve." #: prefs_manage.php:306 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "A meglévő beállítások felülíródnak!" #: prefs_manage.php:321 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Alaphelyzetbe állíthatja az összes beállítását és visszaállíthatja azokat az " +"alapértelmezett értékekre." #: querywindow.php:69 msgid "Import files" @@ -9516,7 +9506,6 @@ msgid "No privileges." msgstr "Nincsenek jogok." #: server_privileges.php:403 server_privileges.php:404 -#, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" @@ -9717,7 +9706,6 @@ msgid "Database for user" msgstr "Adatbázis a felhasználó számára" #: server_privileges.php:2215 -#, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" @@ -11800,10 +11788,9 @@ msgid "Label column" msgstr "Szövegterület oszlopai" #: tbl_gis_visualization.php:138 -#, fuzzy #| msgid "- none -" msgid "-- None --" -msgstr "- nincs -" +msgstr "-- Nincs --" #: tbl_gis_visualization.php:151 #, fuzzy diff --git a/po/ja.po b/po/ja.po index 7070ff0..801612e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-30 05:35-0400\n" -"PO-Revision-Date: 2011-10-26 11:45+0200\n" +"PO-Revision-Date: 2011-10-28 11:58+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "MIME-Version: 1.0\n" @@ -12002,10 +12002,9 @@ msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "バージョンの文字列 (%s) が Drizzle のバージョン形態と一致しています。" #: po/advisory_rules.php:65 -#, fuzzy #| msgid "MySQL charset" msgid "MySQL Architecture" -msgstr "MySQL の文字セット" +msgstr "MySQL 仕様" #: po/advisory_rules.php:66 msgid "MySQL is not compiled as a 64-bit package." @@ -12017,11 +12016,13 @@ msgid "" "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." msgstr "" +"メモリ上限が (このサーバ上において) 3 GiB になってしまいますので、MySQL はメモリを使いこなすことができないでしょう。64 ビット版の " +"MySQL の導入を検討してみてください。" #: po/advisory_rules.php:68 #, php-format msgid "Available memory on this host: %s" -msgstr "" +msgstr "このホスト上の利用可能メモリ: %s" #: po/advisory_rules.php:70 msgid "Query cache disabled" diff --git a/po/ka.po b/po/ka.po index 34be54e..fad4fd1 100644 --- a/po/ka.po +++ b/po/ka.po @@ -13754,7 +13754,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "ცხრილის შექმნა" diff --git a/po/mn.po b/po/mn.po index e651206..52782cc 100644 --- a/po/mn.po +++ b/po/mn.po @@ -13134,7 +13134,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Хүснэгт үүсгэх" diff --git a/po/pl.po b/po/pl.po index 801937f..68f8430 100644 --- a/po/pl.po +++ b/po/pl.po @@ -13615,7 +13615,6 @@ msgstr "concurrent_insert jest ustawione na 0" #~ msgstr "+ Zacznij wprowadzanie od nowa i dodaj nową wartość" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Utwórz tabelę" diff --git a/po/ro.po b/po/ro.po index 0a8b411..1bc48f4 100644 --- a/po/ro.po +++ b/po/ro.po @@ -13423,7 +13423,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Creare tabel" diff --git a/po/sr.po b/po/sr.po index 98c803d..5ec602b 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13321,7 +13321,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Направи табелу" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index a26bae0..ad76bf0 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -13313,7 +13313,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Napravi tabelu" diff --git a/po/te.po b/po/te.po index f4f7687..4149781 100644 --- a/po/te.po +++ b/po/te.po @@ -12527,7 +12527,6 @@ msgstr "" # మొదటి అనువాదము #, fuzzy -#~| msgid "Create a page" #~ msgid "Create Table" #~ msgstr "పుటని సృష్టించు" diff --git a/po/ug.po b/po/ug.po index 89a0345..c7ff5c0 100644 --- a/po/ug.po +++ b/po/ug.po @@ -12644,7 +12644,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create" #~ msgid "Create Table" #~ msgstr "قۇرۇش" diff --git a/po/uz.po b/po/uz.po index 53e37ff..8b100d8 100644 --- a/po/uz.po +++ b/po/uz.po @@ -13946,7 +13946,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Жадвал тузиш" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 0ced29b..7c1c145 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -14009,7 +14009,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Create table" #~ msgid "Create Table" #~ msgstr "Jadval tuzish" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21940-gad9ba4e
by Rouslan Placella 30 Oct '11

30 Oct '11

The branch, master has been updated via ad9ba4e6113bfb59c1700081695f52fc3db7cda0 (commit) via 6762ae67d9080ddd622f7270d062b8d5a82ad8bd (commit) from 4547ca37f4c9f5e71a59849272665c4d0180fb1b (commit) - Log ----------------------------------------------------------------- commit ad9ba4e6113bfb59c1700081695f52fc3db7cda0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Oct 30 18:43:33 2011 +0000 Coding style fixes for db_search.js commit 6762ae67d9080ddd622f7270d062b8d5a82ad8bd Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Oct 30 18:28:47 2011 +0000 Made ajax messages in database search not dismissable ----------------------------------------------------------------------- Summary of changes: js/db_search.js | 97 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 58 insertions(+), 39 deletions(-) diff --git a/js/db_search.js b/js/db_search.js index 4b9ef61..d6a42ff 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -1,10 +1,11 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @fileoverview JavaScript functions used on Database Search page - * @name Database Search + * JavaScript functions used on Database Search page * * @requires jQuery * @requires js/functions.js + * + * @package PhpMyAdmin */ /** @@ -14,36 +15,50 @@ * Retrieve result of SQL query */ -/** Loads the database search results */ -function loadResult(result_path , table_name , link , ajaxEnable) +/** + * Loads the database search results + * + * @param result_path Url of the page to load + * @param table_name Name of table to browse + * @param ajaxEnable Whether to use ajax or not + * + * @return nothing + */ +function loadResult(result_path, table_name, link, ajaxEnable) { $(document).ready(function() { - if(ajaxEnable) - { + if(ajaxEnable) { /** Hides the results shown by the delete criteria */ - PMA_ajaxShowMessage(PMA_messages['strBrowsing']); + var $msg = PMA_ajaxShowMessage(); $('#sqlqueryform').hide(); $('#togglequerybox').hide(); /** Load the browse results to the page */ $("#table-info").show(); $('#table-link').attr({"href" : 'sql.php?'+link }).text(table_name); - $('#browse-results').load(result_path + " '"+'#sqlqueryresults' + "'", null, function() { + var url = result_path + " #sqlqueryresults"; + $('#browse-results').load(url, null, function() { + PMA_ajaxRemoveMessage($msg); // because under db_search, window.parent.table is not defined yet, // we assign it manually from #table-link window.parent.table = $('#table-link').text().trim(); - $('#table_results').makegrid(); }).show(); - } - else - { + } else { event.preventDefault(); } }); } -/** Delete the selected search results */ -function deleteResult(result_path , msg , ajaxEnable) +/** + * Delete the selected search results + * + * @param result_path Url of the page to load + * @param msg Text for the confirmation dialog + * @param ajaxEnable Whether to use ajax or not + * + * @return nothing + */ +function deleteResult(result_path, msg, ajaxEnable) { $(document).ready(function() { /** Hides the results shown by the browse criteria */ @@ -52,14 +67,13 @@ function deleteResult(result_path , msg , ajaxEnable) $('#sqlqueryform').hide(); $('#togglequerybox').hide(); /** Conformation message for deletion */ - if(confirm(msg)) - { - if(ajaxEnable) - { - var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting']); + if(confirm(msg)) { + if(ajaxEnable) { + var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting'], false); /** Load the deleted option to the page*/ $('#sqlqueryform').html(''); - $('#browse-results').load(result_path + " #result_query, #sqlqueryform", function () { + var url = result_path + " #result_query, #sqlqueryform"; + $('#browse-results').load(url, function () { /** Refresh the search results after the deletion */ document.getElementById('buttonGo').click(); $('#togglequerybox').html(PMA_messages['strHideQueryBox']); @@ -69,9 +83,7 @@ function deleteResult(result_path , msg , ajaxEnable) $('#sqlqueryform').show(); $('#togglequerybox').show(); }); - } - else - { + } else { event.preventDefault(); } } @@ -79,17 +91,17 @@ function deleteResult(result_path , msg , ajaxEnable) } $(document).ready(function() { - /** - * Set a parameter for all Ajax queries made on this page. Don't let the - * web server serve cached pagesshow + * Set a parameter for all Ajax queries made on this page. + * Don't let the web server serve cached pages */ $.ajaxSetup({ cache: 'false' }); /** Hide the table link in the initial search result */ - $("#table-info").prepend(PMA_getImage('s_tbl.png', '', {'id': 'table-image'}).toString()).hide(); + var icon = PMA_getImage('s_tbl.png', '', {'id': 'table-image'}).toString(); + $("#table-info").prepend(icon).hide(); /** Hide the browse and deleted results in the new search criteria */ $('#buttonGo').click(function(){ @@ -99,7 +111,7 @@ $(document).ready(function() { $('#togglequerybox').hide(); }); /** - *Prepare a div containing a link for toggle the search results + * Prepare a div containing a link for toggle the search results */ $('<div id="togglesearchresultsdiv"><a id="togglesearchresultlink"></a></div>') .insertAfter('#searchresults') @@ -107,8 +119,10 @@ $(document).ready(function() { .hide(); $(' ').insertAfter("#togglesearchresultsdiv").show(); - /** Changing the displayed text according to the hide/show criteria in search result forms*/ - + /** + * Changing the displayed text according to + * the hide/show criteria in search result forms + */ $('#togglesearchresultlink') .html(PMA_messages['strHideSearchResults']) .bind('click', function() { @@ -124,15 +138,17 @@ $(document).ready(function() { }); /** - * Prepare a div containing a link for toggle the search form, otherwise it's incorrectly displayed - * after a couple of clicks + * Prepare a div containing a link for toggle the search form, + * otherwise it's incorrectly displayed after a couple of clicks */ $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>') .insertAfter('#db_search_form') - /** don't show it until we have results on-screen */ - .hide(); + .hide(); // don't show it until we have results on-screen - /** Changing the displayed text according to the hide/show criteria in search form*/ + /** + * Changing the displayed text according to + * the hide/show criteria in search form + */ $("#togglequerybox").hide(); $("#togglequerybox").bind('click', function() { var $link = $(this); @@ -148,7 +164,10 @@ $(document).ready(function() { /** don't show it until we have results on-screen */ - /** Changing the displayed text according to the hide/show criteria in search criteria form*/ + /** + * Changing the displayed text according to + * the hide/show criteria in search criteria form + */ $('#togglesearchformlink') .html(PMA_messages['strShowSearchCriteria']) .bind('click', function() { @@ -166,19 +185,19 @@ $(document).ready(function() { * Ajax Event handler for retrieving the result of an SQL Query * (see $GLOBALS['cfg']['AjaxEnable']) * - * @uses PMA_ajaxShowMessage() * @see $GLOBALS['cfg']['AjaxEnable'] */ $("#db_search_form.ajax").live('submit', function(event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(PMA_messages['strSearching']); + var $msgbox = PMA_ajaxShowMessage(PMA_messages['strSearching'], false); // jQuery object to reuse $form = $(this); PMA_prepareForAjaxRequest($form); - $.post($form.attr('action'), $form.serialize() + "&submit_search=" + $("#buttonGo").val(), function(response) { + var url = $form.serialize() + "&submit_search=" + $("#buttonGo").val(); + $.post($form.attr('action'), url, function(response) { if (typeof response == 'string') { // found results $("#searchresults").html(response); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21938-g4547ca3
by Rouslan Placella 30 Oct '11

30 Oct '11

The branch, master has been updated via 4547ca37f4c9f5e71a59849272665c4d0180fb1b (commit) from c52063d283fe2e58a397f6832b87ae9fceef0ef2 (commit) - Log ----------------------------------------------------------------- commit 4547ca37f4c9f5e71a59849272665c4d0180fb1b Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Oct 30 16:11:03 2011 +0000 Removed an unncessary AJAX request from database search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++- js/db_search.js | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc44298..a23a65e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,9 +51,10 @@ phpMyAdmin - ChangeLog - bug #3356456 [interface] Interface problems for queries having LIMIT clauses + [interface] Remove DefaultPropDisplay feature - bug #3299486 [prettyprint] Order By in a query containing comment character -- [interface] Improved ENUM/SET editor ++ [interface] Improved ENUM/SET editor + patch #3428376 [pmadb] pmadb on a different MySQL server + patch #3410688 [interface] Improving field size for character columns +- [usability] Removed an unnecessary AJAX request from database search 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/js/db_search.js b/js/db_search.js index 026d470..4b9ef61 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -58,17 +58,16 @@ function deleteResult(result_path , msg , ajaxEnable) { var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting']); /** Load the deleted option to the page*/ - $('#browse-results').load(result_path + " '"+'#result_query' + "'", function () { // FIXME: no need for two ajax reqests here - $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'", function () { // since they both fetch the same page - /** Refresh the search results after the deletion */ - document.getElementById('buttonGo').click(); - $('#togglequerybox').html(PMA_messages['strHideQueryBox']); - PMA_ajaxRemoveMessage($msg); - /** Show the results of the deletion option */ - $('#browse-results').show(); - $('#sqlqueryform').show(); - $('#togglequerybox').show(); - }); + $('#sqlqueryform').html(''); + $('#browse-results').load(result_path + " #result_query, #sqlqueryform", function () { + /** Refresh the search results after the deletion */ + document.getElementById('buttonGo').click(); + $('#togglequerybox').html(PMA_messages['strHideQueryBox']); + PMA_ajaxRemoveMessage($msg); + /** Show the results of the deletion option */ + $('#browse-results').show(); + $('#sqlqueryform').show(); + $('#togglequerybox').show(); }); } else hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21937-gc52063d
by Rouslan Placella 30 Oct '11

30 Oct '11

The branch, master has been updated via c52063d283fe2e58a397f6832b87ae9fceef0ef2 (commit) via f7cb55cb626158d81ac606927142d8f55444b9ff (commit) from 14e00c4dcb17872180964f4d8b2094d7bad55306 (commit) - Log ----------------------------------------------------------------- commit c52063d283fe2e58a397f6832b87ae9fceef0ef2 Merge: 14e00c4 f7cb55c Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Oct 30 14:32:29 2011 +0000 Merge branch 'QA_3_4' Conflicts: js/db_search.js ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/db_search.js | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fdc416..fc44298 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog - bug #3425230 [interface] enum data split at space char (more space to edit) - bug #3426840 [interface] ENUM/SET editor can't handle commas in values - bug #3427256 [interface] no links to browse/empty views and tables +- bug #3430377 [interface] Deleted search results remain visible 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/db_search.js b/js/db_search.js index 79efddb..026d470 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -56,18 +56,20 @@ function deleteResult(result_path , msg , ajaxEnable) { if(ajaxEnable) { + var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting']); /** Load the deleted option to the page*/ - $('#browse-results').load(result_path + " '"+'#result_query' + "'"); - $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'"); - $('#togglequerybox').html(PMA_messages['strShowQueryBox']); - - /** Refresh the search results after the deletion */ - document.getElementById('buttonGo'). click(); - PMA_ajaxShowMessage(PMA_messages['strDeleting']); - /** Show the results of the deletion option */ - $('#browse-results').show(); - $('#sqlqueryform').hide(); - $('#togglequerybox').show(); + $('#browse-results').load(result_path + " '"+'#result_query' + "'", function () { // FIXME: no need for two ajax reqests here + $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'", function () { // since they both fetch the same page + /** Refresh the search results after the deletion */ + document.getElementById('buttonGo').click(); + $('#togglequerybox').html(PMA_messages['strHideQueryBox']); + PMA_ajaxRemoveMessage($msg); + /** Show the results of the deletion option */ + $('#browse-results').show(); + $('#sqlqueryform').show(); + $('#togglequerybox').show(); + }); + }); } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-7-gf7cb55c
by Rouslan Placella 30 Oct '11

30 Oct '11

The branch, QA_3_4 has been updated via f7cb55cb626158d81ac606927142d8f55444b9ff (commit) from 694c1cdf751e1fcbe2435087e3cea0dcd85ca458 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/db_search.js | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0219da3..904e529 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #3425230 [interface] enum data split at space char (more space to edit) - bug #3426840 [interface] ENUM/SET editor can't handle commas in values - bug #3427256 [interface] no links to browse/empty views and tables +- bug #3430377 [interface] Deleted search results remain visible 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/db_search.js b/js/db_search.js index 79c444e..f9a9416 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -48,18 +48,20 @@ function deleteResult(result_path , msg , ajaxEnable){ { if(ajaxEnable) { + var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting']); /** Load the deleted option to the page*/ - $('#browse-results').load(result_path + " '"+'#result_query' + "'"); - $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'"); - $('#togglequerybox').html(PMA_messages['strHideQueryBox']); - - /** Refresh the search results after the deletion */ - document.getElementById('buttonGo'). click(); - //PMA_ajaxShowMessage(PMA_messages['strDeleting']); - /** Show the results of the deletion option */ - $('#browse-results').show(); - $('#sqlqueryform').show(); - $('#togglequerybox').show(); + $('#browse-results').load(result_path + " '"+'#result_query' + "'", function () { // FIXME: no need for two ajax reqests here + $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'", function () { // since they both fetch the same page + /** Refresh the search results after the deletion */ + document.getElementById('buttonGo').click(); + $('#togglequerybox').html(PMA_messages['strHideQueryBox']); + PMA_ajaxRemoveMessage($msg); + /** Show the results of the deletion option */ + $('#browse-results').show(); + $('#sqlqueryform').show(); + $('#togglequerybox').show(); + }); + }); } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21934-g6f7ca79
by Marc Delisle 30 Oct '11

30 Oct '11

The branch, master has been updated via 6f7ca79218c0438cfcf34639295bc87550fc677e (commit) from fd5f916ea92ae5a15de643e25441b9bdd68cc2e9 (commit) - Log ----------------------------------------------------------------- commit 6f7ca79218c0438cfcf34639295bc87550fc677e Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 30 05:35:00 2011 -0400 patch #3410688 [interface] Improving field size for character columns ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 8 ++++++++ libraries/config.default.php | 14 ++++++++++++++ libraries/config/messages.inc.php | 4 ++++ libraries/config/setup.forms.php | 2 ++ libraries/config/user_preferences.forms.php | 2 ++ tbl_change.php | 13 +++++++++++-- 7 files changed, 42 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d10a483..7fdc416 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ phpMyAdmin - ChangeLog - bug #3299486 [prettyprint] Order By in a query containing comment character - [interface] Improved ENUM/SET editor + patch #3428376 [pmadb] pmadb on a different MySQL server ++ patch #3410688 [interface] Improving field size for character columns 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/Documentation.html b/Documentation.html index e1ce310..0a403ce 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1699,6 +1699,14 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> </ul> Default is old behavior so input.</dd> + <dt id="cfg_MinSizeForInputField">$cfg['MinSizeForInputField'] integer</dt> + <dd>Defines the minimum size for input fields generated for CHAR and + VARCHAR columns.</dd> + + <dt id="cfg_MaxSizeForInputField">$cfg['MaxSizeForInputField'] integer</dt> + <dd>Defines the maximum size for input fields generated for CHAR and + VARCHAR columns.</dd> + <dt id="cfg_InsertRows">$cfg['InsertRows'] integer</dt> <dd>Defines the maximum number of concurrent entries for the Insert page.</dd> diff --git a/libraries/config.default.php b/libraries/config.default.php index 98ace3f..8dff000 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1028,6 +1028,20 @@ $cfg['ShowFieldTypesInDataEditView'] = true; $cfg['CharEditing'] = 'input'; /** + * The minimum size for character input fields + * + * @global integer $cfg['MinSizeForInputField'] + */ +$cfg['MinSizeForInputField'] = 4; + +/** + * The maximum size for character input fields + * + * @global integer $cfg['MinSizeForInputField'] + */ +$cfg['MaxSizeForInputField'] = 60; + +/** * How many rows can be inserted at one time * * @global integer $cfg['InsertRows'] diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 5d19922..35a8392 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -31,6 +31,10 @@ $strConfigBZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2 $strConfigBZipDump_name = __('Bzip2'); $strConfigCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns'); $strConfigCharEditing_name = __('CHAR columns editing'); +$strConfigMinSizeForInputField_desc = __('Defines the minimum size for input fields generated for CHAR and VARCHAR columns'); +$strConfigMinSizeForInputField_name = __('Minimum size for input field'); +$strConfigMaxSizeForInputField_desc = __('Defines the maximum size for input fields generated for CHAR and VARCHAR columns'); +$strConfigMaxSizeForInputField_name = __('Maximum size for input field'); $strConfigCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas'); $strConfigCharTextareaCols_name = __('CHAR textarea columns'); $strConfigCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index a8b8591..d42f60d 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -213,6 +213,8 @@ $forms['Main_frame']['Edit'] = array( 'ShowFunctionFields', 'ShowFieldTypesInDataEditView', 'CharEditing', + 'MinSizeForInputField', + 'MaxSizeForInputField', 'CharTextareaCols', 'CharTextareaRows', 'TextareaCols', diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index e0b2d18..44fad4b 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -38,6 +38,8 @@ $forms['Features']['General'] = array( 'ShowHint'); $forms['Features']['Text_fields'] = array( 'CharEditing', + 'MinSizeForInputField', + 'MaxSizeForInputField', 'CharTextareaCols', 'CharTextareaRows', 'TextareaCols', diff --git a/tbl_change.php b/tbl_change.php index 2dbbc5b..4ffe4b2 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -916,8 +916,17 @@ foreach ($rows as $row_id => $vrow) { elseif (in_array($field['pma_type'], $no_support_types)) { // ignore this column to avoid changing it } else { - // field size should be at least 4 and max 40 - $fieldsize = min(max($field['len'], 4), 40); + if ($field['is_char']) { + $fieldsize = $extracted_fieldspec['spec_in_brackets']; + } else { + /** + * This case happens for example for INT or DATE columns; + * in these situations, the value returned in $field['len'] + * seems appropriate. + */ + $fieldsize = $field['len']; + } + $fieldsize = min(max($fieldsize, $cfg['MinSizeForInputField']), $cfg['MaxSizeForInputField']); echo $backup_field . "\n"; if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21932-gc380102
by Marc Delisle 29 Oct '11

29 Oct '11

The branch, master has been updated via c3801028167ed4e3734c7e5205c07310b2d22ecb (commit) via 8fd1ae10bb15e5c861c30e233aab493220c78e68 (commit) via 46ce1d765e4322a5765bc49b427168c44c2ca07d (commit) via 991cbfcc97c2c616f77f911c8de172f88dec4de0 (commit) via af8a61f73c25bdf6b2259d2ac6a9eae5f5835ce1 (commit) from 240cb2418cbe7f870801451e89002f07871d2381 (commit) - Log ----------------------------------------------------------------- commit c3801028167ed4e3734c7e5205c07310b2d22ecb Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 29 08:24:11 2011 -0400 Setup for controlhost commit 8fd1ae10bb15e5c861c30e233aab493220c78e68 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 29 08:11:02 2011 -0400 Documentation for controlhost commit 46ce1d765e4322a5765bc49b427168c44c2ca07d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 29 08:07:44 2011 -0400 Default values for controlhost commit 991cbfcc97c2c616f77f911c8de172f88dec4de0 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 29 07:58:40 2011 -0400 Provide for the case when controlhost is not defined commit af8a61f73c25bdf6b2259d2ac6a9eae5f5835ce1 Author: Marco Gergele <mgergele(a)users.sourceforge.net> Date: Sat Oct 29 07:55:39 2011 -0400 patch #3428376 [pmadb] pmadb on a different MySQL server ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 6 ++++++ config.sample.inc.php | 1 + libraries/common.inc.php | 11 +++++++++-- libraries/config.default.php | 9 +++++++++ libraries/config/messages.inc.php | 2 ++ libraries/config/setup.forms.php | 1 + 7 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e2e9c4..d10a483 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog + [interface] Remove DefaultPropDisplay feature - bug #3299486 [prettyprint] Order By in a query containing comment character - [interface] Improved ENUM/SET editor ++ patch #3428376 [pmadb] pmadb on a different MySQL server 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/Documentation.html b/Documentation.html index 9aeaa66..e1ce310 100644 --- a/Documentation.html +++ b/Documentation.html @@ -710,6 +710,12 @@ since this link provides funding for phpMyAdmin. <dd>Whether to use a compressed protocol for the MySQL server connection or not (experimental).</dd> + <dt id="controlhost"> + $cfg['Servers'][$i]['controlhost'] string + </dt> + <dd>Permits to use an alternate host to hold the configuration storage + data.</dd> + <dt id="controluser"> $cfg['Servers'][$i]['controluser'] string $cfg['Servers'][$i]['controlpass'] string diff --git a/config.sample.inc.php b/config.sample.inc.php index aa363d6..0eab148 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -40,6 +40,7 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false; */ /* User used to manipulate with storage */ +// $cfg['Servers'][$i]['controlhost'] = ''; // $cfg['Servers'][$i]['controluser'] = 'pma'; // $cfg['Servers'][$i]['controlpass'] = 'pmapass'; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 1c7e4d1..730cf19 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -919,8 +919,15 @@ if (! defined('PMA_MINIMUM_COMMON')) { // scripts) $controllink = false; if ($cfg['Server']['controluser'] != '') { - $controllink = PMA_DBI_connect($cfg['Server']['controluser'], - $cfg['Server']['controlpass'], true); + if (! empty($cfg['Server']['controlhost'])) { + $controllink = PMA_DBI_connect($cfg['Server']['controluser'], + $cfg['Server']['controlpass'], true, + array('host' => $cfg['Server']['controlhost']) + ); + } else { + $controllink = PMA_DBI_connect($cfg['Server']['controluser'], + $cfg['Server']['controlpass'], true); + } } // Connects to the server (validates user's login) diff --git a/libraries/config.default.php b/libraries/config.default.php index e91638d..98ace3f 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -152,6 +152,15 @@ $cfg['Servers'][$i]['extension'] = 'mysqli'; $cfg['Servers'][$i]['compress'] = false; /** + * MySQL control host. This permits to use a host different than the + * main host, for the phpMyAdmin configuration storage. If left empty, + * $cfg['Servers'][$i]['host'] is used instead. + * + * @global string $cfg['Servers'][$i]['controlhost'] + */ +$cfg['Servers'][$i]['controlhost'] = ''; + +/** * MySQL control user settings (this user must have read-only * access to the "mysql/user" and "mysql/db" tables). The controluser is also * used for all relational features (pmadb) diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index f396550..5d19922 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -378,6 +378,8 @@ $strConfigServers_connect_type_name = __('Connection type'); $strConfigServers_controlpass_name = __('Control user password'); $strConfigServers_controluser_desc = __('A special MySQL user configured with limited permissions, more information available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]'); $strConfigServers_controluser_name = __('Control user'); +$strConfigServers_controlhost_desc = __('An alternate host to hold the configuration storage; leave blank to use the already defined host'); +$strConfigServers_controlhost_name = __('Control host'); $strConfigServers_CountTables_desc = __('Count tables when showing database list'); $strConfigServers_CountTables_name = __('Count tables'); $strConfigServers_designer_coords_desc = __('Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/kbd]'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index cddb88d..a8b8591 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -64,6 +64,7 @@ $forms['Servers']['Server_config'] = array('Servers' => array(1 => array( 'CountTables'))); $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array( 'pmadb' => 'phpmyadmin', + 'controlhost', 'controluser', 'controlpass', 'verbose_check', hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git October 2011