From b3c1b005f64e5504979fecbf7f3f25bff5ee41cd Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Tue, 27 Jan 2015 15:38:24 +0100 Subject: [PATCH 1/5] Translated using Weblate (Slovak) Currently translated at 83.6% (2493 of 2979 strings) [CI skip] --- po/sk.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/sk.po b/po/sk.po index 313c683308..be2073f448 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-01-25 21:35+0200\n" +"PO-Revision-Date: 2015-01-27 15:38+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" @@ -6818,10 +6818,9 @@ msgstr "" "[kbd]pma__savedsearches[/kbd]." #: libraries/config/messages.inc.php:607 -#, fuzzy #| msgid "Central columns" msgid "Central columns table" -msgstr "Centrálne stĺpce" +msgstr "Tabuľka centrálnych stĺpcov" #: libraries/config/messages.inc.php:609 #, fuzzy @@ -6937,10 +6936,9 @@ msgstr "" "tabuliek počas sedenia. Odporúčaná hodnota: [kbd]pma__favorite[/kbd]." #: libraries/config/messages.inc.php:644 -#, fuzzy #| msgid "Favorite tables" msgid "Favorites table" -msgstr "Obľúbené tabuľky" +msgstr "Tabuľka obľúbených" #: libraries/config/messages.inc.php:646 #| msgid "" @@ -14420,10 +14418,10 @@ msgid "Description" msgstr "Popis" #: url.php:35 -#, fuzzy, php-format +#, php-format #| msgid "Tracking report" msgid "Taking you to %s." -msgstr "Beriem ťa k %s." +msgstr "Smerujem ťa na %s." #: user_password.php:29 msgid "You don't have sufficient privileges to be here right now!" From 9d75df67de44c495e00c617a17a8a10d3b842821 Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Wed, 28 Jan 2015 17:14:21 +0100 Subject: [PATCH 2/5] Translated using Weblate (Dutch) Currently translated at 100.0% (2981 of 2981 strings) [CI skip] --- po/nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index 83fc393eb4..1d2eafadf8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-01-14 17:27+0200\n" +"PO-Revision-Date: 2015-01-28 17:14+0200\n" "Last-Translator: dingo thirteen \n" "Language-Team: Dutch " "\n" @@ -26,7 +26,7 @@ msgstr "" #: db_central_columns.php:85 msgid "The central list of columns for the current database is empty." -msgstr "De centrale lijst van kolommen voor de huidige database is leeg." +msgstr "De centrale lijst met kolommen voor de huidige database is leeg." #: db_central_columns.php:109 msgid "Click to sort." From 4db46ba6cfd4aa5cb40adc5bce726e3b2d1d3f29 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 29 Jan 2015 21:36:41 +0530 Subject: [PATCH 3/5] bug #4738 Header lose align when scrolling in Firefox Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/sql.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5528ef1437..0569bf1f4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4734 Default values for binary fields do not support binary values - bug #4736 Changing display options breaks query highlighting - bug Undefined index submit_type +- bug #4738 Header lose align when scrolling in Firefox 4.3.8.0 (2015-01-24) - bug Undefined constant PMA_DRIZZLE diff --git a/js/sql.js b/js/sql.js index abc3400220..74ac5a0d3b 100644 --- a/js/sql.js +++ b/js/sql.js @@ -793,7 +793,11 @@ function rearrangeStickyColumns() { var $clonedHeader = $originalHeader.clone(); // clone width per cell $clonedHeader.find("tr:first").children().width(function(i,val) { - return Math.floor($originalColumns.eq(i).width()) + 1; + var width = $originalColumns.eq(i).width(); + if (! $.browser.mozilla) { + width += 1; + } + return width; }); $sticky_columns.empty().append($clonedHeader); } From 2ed5ca0aaf86d745742725881602b7239cf739e7 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 29 Jan 2015 21:36:41 +0530 Subject: [PATCH 4/5] bug #4738 Header lose align when scrolling in Firefox Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/sql.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5528ef1437..0569bf1f4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4734 Default values for binary fields do not support binary values - bug #4736 Changing display options breaks query highlighting - bug Undefined index submit_type +- bug #4738 Header lose align when scrolling in Firefox 4.3.8.0 (2015-01-24) - bug Undefined constant PMA_DRIZZLE diff --git a/js/sql.js b/js/sql.js index abc3400220..b5b1285dfe 100644 --- a/js/sql.js +++ b/js/sql.js @@ -793,7 +793,11 @@ function rearrangeStickyColumns() { var $clonedHeader = $originalHeader.clone(); // clone width per cell $clonedHeader.find("tr:first").children().width(function(i,val) { - return Math.floor($originalColumns.eq(i).width()) + 1; + var width = $originalColumns.eq(i).width(); + if (! $.browser.mozilla) { + width += 1; + } + return width; }); $sticky_columns.empty().append($clonedHeader); } From 4d6c6e53acb9dbef36bc8d98be466f8776834070 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 30 Jan 2015 10:03:12 +0530 Subject: [PATCH 5/5] rfe #719 more details in PDF relation view Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + .../schema/pdf/Pdf_Relation_Schema.class.php | 27 ++++++++++++++----- libraries/relation.lib.php | 6 +++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74b27ced73..ad8c7a7acd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog + rfe #801 Builtin transformations and relations + rfe #767 USING BTREE support for HEAP/MEMORY tables + rfe #1596 Make "Options > Relational" configurable ++ rfe #719 more details in PDF relation view 4.3.9.0 (not yet released) - bug #4728 Incorrect headings in routine editor diff --git a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php index 126367f3b2..55afe3b7f7 100644 --- a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php +++ b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php @@ -1018,19 +1018,32 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->Bookmark($field_name, 1, -1); $pdf->SetLink($pdf->PMA_links['doc'][$table][$field_name], -1); $foreigner = PMA_searchColumnInForeigners($res_rel, $field_name); + + $linksTo = ''; + if ($foreigner) { + $linksTo = '-> '; + if ($foreigner['foreign_db'] != $GLOBALS['db']) { + $linksTo .= $foreigner['foreign_db'] . '.'; + } + $linksTo .= $foreigner['foreign_table'] + . '.' . $foreigner['foreign_field']; + + if (isset($foreigner['on_update'])) { // not set for internal + $linksTo .= "\n" . 'ON UPDATE ' . $foreigner['on_update']; + $linksTo .= "\n" . 'ON DELETE ' . $foreigner['on_delete']; + } + } + $pdf_row = array( $field_name, $type, $attribute, - ($row['Null'] == '' || $row['Null'] == 'NO') - ? __('No') - : __('Yes'), + (($row['Null'] == '' || $row['Null'] == 'NO') + ? __('No') + : __('Yes')), (isset($row['Default']) ? $row['Default'] : ''), $row['Extra'], - ($foreigner - ? $foreigner['foreign_table'] . ' -> ' - . $foreigner['foreign_field'] - : ''), + $linksTo, (isset($comments[$field_name]) ? $comments[$field_name] : ''), diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index b7aa5fbc0e..e3e7bd4c17 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1824,6 +1824,12 @@ function PMA_searchColumnInForeigners($foreigners, $column) : $GLOBALS['db']; $foreigner['foreign_table'] = $one_key['ref_table_name']; $foreigner['constraint'] = $one_key['constraint']; + $foreigner['on_update'] = isset($one_key['on_update']) + ? $one_key['on_update'] + : 'RESTRICT'; + $foreigner['on_delete'] = isset($one_key['on_delete']) + ? $one_key['on_delete'] + : 'RESTRICT'; return $foreigner; }