diff --git a/ChangeLog b/ChangeLog index 5b34ab9a7b..c875a354fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog + issue Copy results to clipboard + issue #11504 Reactivate cut&paste possibility in print view - issue #11702 Extraneous message after edit + grid-edit +- issue #11668 Table header is empty with browsing an empty table 4.5.3.0 (not yet released) - issue #11664 Online syntax verifier bug - "IF" on SELECT statement diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php index ddc9f0970a..a2a2145113 100644 --- a/libraries/DisplayResults.php +++ b/libraries/DisplayResults.php @@ -4327,7 +4327,7 @@ class DisplayResults $message, $this->__get('sql_query'), 'success' ); - } elseif (! isset($printview) || ($printview != '1')) { + } elseif ((!isset($printview) || ($printview != '1')) && !$is_limited_display) { $table_html .= Util::getMessage( __('Your SQL query has been executed successfully.'), @@ -4405,6 +4405,10 @@ class DisplayResults // end 2b // 3. ----- Prepare the results table ----- + if ($is_limited_display) { + $table_html .= "
"; + } + $table_html .= $this->_getTableHeaders( $displayParts, $analyzed_sql_results, @@ -5811,4 +5815,3 @@ class DisplayResults return array($truncated, $str, $original_length); } } - diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index b64f120b60..30bf1d49e2 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -5216,8 +5216,6 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password) $create_user_stmt .= ' AS \'%s\''; } - $create_user_real = $create_user_show = $create_user_stmt; - if ($_POST['pred_password'] == 'keep') { $create_user_real = sprintf( $create_user_stmt, diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 661201ad03..9460f5024e 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1365,11 +1365,16 @@ function PMA_getMessageForNoRowsReturned($message_to_show, * @param int $num_rows number of rows * @param DisplayResults $displayResultsObject DisplayResult instance * @param array $extra_data extra data + * @param string $pmaThemeImage uri of the theme image + * @param object $result executed query results + * @param string $sql_query sql query + * @param string $complete_query complete sql query * * @return string html */ function PMA_getQueryResponseForNoResultsReturned($analyzed_sql_results, $db, - $table, $message_to_show, $num_rows, $displayResultsObject, $extra_data + $table, $message_to_show, $num_rows, $displayResultsObject, $extra_data, + $pmaThemeImage, $result, $sql_query, $complete_query ) { if (PMA_isDeleteTransformationInfo($analyzed_sql_results)) { PMA_deleteTransformationInfo($db, $table, $analyzed_sql_results); @@ -1405,9 +1410,39 @@ function PMA_getQueryResponseForNoResultsReturned($analyzed_sql_results, $db, $response->addJSON(isset($extra_data) ? $extra_data : array()); if (!empty($analyzed_sql_results['is_select'])) { + $url_query = isset($url_query) ? $url_query : null; + + $displayParts = array( + 'edit_lnk' => null, + 'del_lnk' => null, + 'sort_lnk' => '1', + 'nav_bar' => '0', + 'bkm_form' => '1', + 'text_btn' => '1', + 'pview_lnk' => '1' + ); + + $html_output .= PMA_getHtmlForSqlQueryResultsTable( + $displayResultsObject, + $pmaThemeImage, $url_query, $displayParts, + false, 0, $num_rows, true, $result, + $analyzed_sql_results, true + ); + $html_output .= $displayResultsObject->getCreateViewQueryResultOp( $analyzed_sql_results ); + + $cfgBookmark = PMA_Bookmark_getParams(); + if ($cfgBookmark) { + $html_output .= PMA_getHtmlForBookmark( + $displayParts, + $cfgBookmark, + $sql_query, $db, $table, + isset($complete_query) ? $complete_query : $sql_query, + $cfgBookmark['user'] + ); + } } } @@ -1502,13 +1537,14 @@ function PMA_getBookmarkCreatedMessage() * @param bool $showtable whether to show table or not * @param object $result result of the executed query * @param array $analyzed_sql_results analyzed sql results + * @param bool $is_limited_display Show only limited operations or not * * @return String */ function PMA_getHtmlForSqlQueryResultsTable($displayResultsObject, $pmaThemeImage, $url_query, $displayParts, $editable, $unlim_num_rows, $num_rows, $showtable, $result, - $analyzed_sql_results + $analyzed_sql_results, $is_limited_display = false ) { $printview = isset($_REQUEST['printview']) ? $_REQUEST['printview'] : null; $table_html = ''; @@ -1562,7 +1598,8 @@ function PMA_getHtmlForSqlQueryResultsTable($displayResultsObject, $table_html .= $displayResultsObject->getTable( $result, $displayParts, - $analyzed_sql_results + $analyzed_sql_results, + $is_limited_display ); } @@ -1600,7 +1637,8 @@ function PMA_getHtmlForSqlQueryResultsTable($displayResultsObject, $table_html .= $displayResultsObject->getTable( $result, $displayParts, - $analyzed_sql_results + $analyzed_sql_results, + $is_limited_display ); $GLOBALS['dbi']->freeResult($result); } @@ -2062,7 +2100,9 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results, $html_output = PMA_getQueryResponseForNoResultsReturned( $analyzed_sql_results, $db, $table, isset($message_to_show) ? $message_to_show : null, - $num_rows, $displayResultsObject, $extra_data + $num_rows, $displayResultsObject, $extra_data, + $pmaThemeImage, isset($result) ? $result : null, + $sql_query, isset($complete_query) ? $complete_query : null ); } else { // At least one row is returned -> displays a table with results @@ -2135,4 +2175,3 @@ function PMA_calculatePosForLastPage($db, $table, $pos) return $pos; } - diff --git a/po/et.po b/po/et.po index fc0648d34f..df07f5eb6a 100644 --- a/po/et.po +++ b/po/et.po @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-11-18 09:43-0500\n" -"PO-Revision-Date: 2015-11-18 12:57+0000\n" +"PO-Revision-Date: 2015-11-30 10:07+0000\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"Language-Team: Estonian " +"\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -353,7 +353,7 @@ msgstr "Andmebaasi logi" msgid "" "An error has been detected and an error report has been automatically " "submitted based on your settings." -msgstr "Tuvastati viga, mis raporteeriti automaatselt vastavalt su seadetele." +msgstr "Tuvastati viga, mis vastavalt su sätetele raporteeriti automaatselt." #: error_report.php:72 msgid "Thank you for submitting this report." @@ -1165,7 +1165,7 @@ msgstr "" "Diagrammi korrastuse seadistus sinu veebilehitsejate kohalikus " "salvestuskohas ei ole enam jälgimise dialoogi uuema versiooniga ühilduv. " "Üldjuhul sinu praegune seadistus enam ei toimi. Palun lähtesta oma seadistus " -"vaikimisi väärtustele Sätete menüüst." +"vaikimisi väärtustele menüüst Sätted." #: js/messages.php:173 msgid "Query cache efficiency" @@ -2502,7 +2502,7 @@ msgstr "Ignoreeri kõiki" #: js/messages.php:681 msgid "" "As per your settings, they are being submitted currently, please be patient." -msgstr "Palun oota, sinu seadistust saadetakse hetkel." +msgstr "Palun oota, sinu sätteid saadetakse hetkel." #: js/messages.php:691 msgid "Execute this query again?" @@ -2544,10 +2544,10 @@ msgid "" "limit has been reached, some features may not work properly for you. In " "Safari, such problem is commonly caused by \"Private Mode Browsing\"." msgstr "" -"Su veebilehitseha ei toeta seadistuse kohalikku salvestamist, või on jõutud " +"Su veebilehitseja ei toeta sätete kohalikku salvestamist, või on jõutud " "selleks lubatud mahuni. Seetõttu ei pruugi mõned omadused korrektselt " -"töötada. Safaris põhjustab seda tavaliselt \"Privaartrežiimis lehitsemine" -"\" (\"Private Mode Browsing\")." +"töötada. Safaris põhjustab seda tavaliselt \"Privaartrežiimis lehitsemine\" (" +"\"Private Mode Browsing\")." #: js/messages.php:735 msgctxt "Previous month" @@ -3185,7 +3185,7 @@ msgid "" "this permanent, view settings." msgstr "" "Käivita päringud klahviga Enter ja sisesta reavahetused Shift + Enter " -"kombinatsiooniga." +"kombinatsiooniga. Selle püsivaks tegemiseks vaata sätteid." #: libraries/Console.php:392 msgid "Switch to dark theme" @@ -5210,7 +5210,7 @@ msgstr "Luba kasutajatel seda väärtust muuta" #: libraries/config/PageSettings.php:141 msgid "Cannot save settings, submitted configuration form contains errors!" -msgstr "Sättete salvestamine nurjus; saadetud häälestus sisaldab vigu!" +msgstr "Sätete salvestamine nurjus; saadetud häälestus sisaldab vigu!" #: libraries/config/ServerConfigChecks.php:170 msgid "You should use SSL connections if your database server supports it." @@ -6067,7 +6067,7 @@ msgstr "Muud tuumsätted" #: libraries/config/messages.inc.php:285 msgid "Settings that didn't fit anywhere else." -msgstr "Sätted, mis ei sobi mujale." +msgstr "Sätted, mis mujale ei sobi." #: libraries/config/messages.inc.php:286 msgid "Page titles" @@ -8806,7 +8806,7 @@ msgstr "Vaata struktuuri sisu, klõpsates selle nimel." #: libraries/import.lib.php:1261 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link." -msgstr "Muuda selle mistahes sätet, klõpsates vastaval \"Valikud\" lingil." +msgstr "Selle mistahes sätte muutmiseks klõpsa vastaval viidal \"Valikud\"." #: libraries/import.lib.php:1263 msgid "Edit structure by following the \"Structure\" link." @@ -9237,7 +9237,7 @@ msgstr "phpMyAdmini dokumentatsioon" #: libraries/navigation/NavigationHeader.php:206 msgid "Navigation panel settings" -msgstr "Navigeerimispaneeli seaded" +msgstr "Navigeerimispaneeli sätted" #: libraries/navigation/NavigationHeader.php:217 msgid "Reload navigation panel" @@ -11090,7 +11090,7 @@ msgstr "Veergude keskse nimekirja haldamine" #: libraries/relation.lib.php:335 msgid "Remembering Designer Settings" -msgstr "Disaineri seadistuse meeldejätmine" +msgstr "Disaineri sätete meeldejätmine" #: libraries/relation.lib.php:346 msgid "Saving export templates" @@ -12030,7 +12030,7 @@ msgstr "Lubab kustutada andmebaase ja tabeleid." #: libraries/server_privileges.lib.php:316 #: libraries/server_privileges.lib.php:1435 server_privileges.php:93 msgid "Allows reloading server settings and flushing the server's caches." -msgstr "Lubab uuesti laadida serveri sätteid ja puhastada serveri puhvreid." +msgstr "Lubab serveri sätteid uuesti laadida ja tühjendada serveri vahemälu." #: libraries/server_privileges.lib.php:321 #: libraries/server_privileges.lib.php:1439 server_privileges.php:102 @@ -12737,8 +12737,9 @@ msgid "" "chart using the cog icon on each respective chart." msgstr "" "Sinu veebilehitseja värskendab kõiki näidatavaid diagramme iga teatud aja " -"tagant. 'Sätted' all võid diagramme lisada ja muuta värskendussagedust või " -"eemaldada diagrammi, kasutades hammasratta ikooni vastaval diagrammil." +"tagant. Valiku 'Sätted' alt saad diagramme lisada ja muuta " +"värskendussagedust või diagrammi eemaldada kasutades selleks hammasratta " +"ikooni vastaval diagrammil." #: libraries/server_status_monitor.lib.php:138 msgid "" @@ -14235,7 +14236,7 @@ msgstr "Sätted imporditakse sinu veebilehitseja kohalikust salvestuskohast." #: prefs_manage.php:266 msgid "You have no saved settings!" -msgstr "Sul pole salvestatud sätteid!" +msgstr "Sul ei ole salvestatud sätteid!" #: prefs_manage.php:271 prefs_manage.php:350 msgid "This feature is not supported by your web browser" @@ -14251,8 +14252,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Saad rakendada rohkem sätteid, kui muudad config.inc.php faili, nt kasutades " -"%sPaigaldaja skripti%s." +"Täiendavaid sätteid saad rakendada, kui muudad faili config.inc.php. Kasuta " +"näiteks %sPaigaldaja skripti%s." #: prefs_manage.php:326 msgid "Save to browser's storage" @@ -14268,7 +14269,7 @@ msgstr "Olemasolevad sätted kirjutatakse üle!" #: prefs_manage.php:369 msgid "You can reset all your settings and restore them to default values." -msgstr "Saad lähtestada kõik sätted ja taastada need vaikimisi väärtustele." +msgstr "Saad lähtestada kõik sätted ja taastada nende vaikeväärtused." #: server_databases.php:107 msgid "No databases" @@ -15027,8 +15028,8 @@ msgid "" "phpMyAdmin team to help us in debugging the problem." msgstr "" "phpMyAdminis juhtus viga. Me kogusime andmeid selle vea kohta ja samuti " -"olulist informatsiooni seadistustest, et saata phpMyAdmini arendajatele " -"probleemist paremini arusaamiseks." +"sätete olulist informatsiooni, et need saata phpMyAdmini arendajatele " +"probleemist paremaks arusaamiseks." #: templates/error/report_form.phtml:15 msgid "You may examine the data in the error report:"