16 Sep
2010
16 Sep
'10
5:18 p.m.
The branch, master has been updated
via 728034d7eabac3f7c6b2a3b144e4720868be082b (commit)
from 8417db5866925779c053c48f9c9fc046a891d83a (commit)
- Log -----------------------------------------------------------------
commit 728034d7eabac3f7c6b2a3b144e4720868be082b
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Sep 16 16:18:23 2010 +0200
bug #1669459 [interface] Do not automatically mark PDF schema rows to delete
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/schema/User_Schema.class.php | 42 ++++++++++++++++----------------
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7c3e4fe..c4cfa35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,7 @@
- rfe #1105678 [interface] Drop page-break-before as it is useless for smaller
tables.
- rfe #2956556 [interface] Allow to wrap enum values.
+- bug #1669459 [interface] Do not automatically mark PDF schema rows to delete
3.3.8.0 (not yet released)
- bug #3059311 [import] BIGINT field type added to table analysis
diff --git a/libraries/schema/User_Schema.class.php
b/libraries/schema/User_Schema.class.php
index 36f9c36..930bad2 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -24,7 +24,7 @@ class PMA_User_Schema
public $pageNumber;
public $c_table_rows;
public $action;
-
+
public function setAction($value)
{
$this->action = $value;
@@ -34,7 +34,7 @@ class PMA_User_Schema
* and tables which will be exported as Relational schema
* you can set the table positions on the paper via scratchboard
* for table positions, put the x,y co-ordinates
- *
+ *
* @param string $this->action It tells what the Schema is supposed to do
* create and select a page, generate schema etc
* @access public
@@ -78,7 +78,7 @@ class PMA_User_Schema
}
/**
- * shows/displays the HTML FORM to create the page
+ * shows/displays the HTML FORM to create the page
*
* @param string db name of the selected database
* @return void
@@ -108,7 +108,7 @@ class PMA_User_Schema
/*
* Check to see whether INNODB and PBXT storage engines are Available in MYSQL
PACKAGE
* If available, then provide AutoLayout for Foreign Keys in Schema View
- */
+ */
if (PMA_StorageEngine::isValid('InnoDB') ||
PMA_StorageEngine::isValid('PBXT')) {
?>
@@ -181,10 +181,10 @@ class PMA_User_Schema
echo "\n";
} // end function
- /**
+ /**
* A dashboard is displayed to AutoLayout the position of tables
* users can drag n drop the tables and change their positions
- *
+ *
* @return void
* @access public
*/
@@ -201,9 +201,9 @@ class PMA_User_Schema
}
/*
- * Now if we already have chosen a page number then we should
+ * Now if we already have chosen a page number then we should
* show the tables involved
- */
+ */
if (isset($this->choosenPage) && $this->choosenPage > 0) {
echo "\n";
@@ -249,7 +249,7 @@ class PMA_User_Schema
foreach ($array_sh_page as $dummy_sh_page => $sh_page) {
$_mtab = $sh_page['table_name'];
$tabExist[$_mtab] = FALSE;
- echo "\n" . ' <tr class="';
+ echo "\n" . ' <tr class="noclick ';
if ($odd_row) {
echo 'odd';
} else {
@@ -284,7 +284,7 @@ class PMA_User_Schema
/*
* Add one more empty row
*/
- echo "\n" . ' <tr class="';
+ echo "\n" . ' <tr class="noclick ';
if ($odd_row) {
echo 'odd';
} else {
@@ -321,11 +321,11 @@ class PMA_User_Schema
$this->_deleteTables($db, $this->choosenPage, isset($tabExist));
}
- /**
+ /**
* show Export relational schema generation options
* user can select export type of his own choice
* and the attributes related to it
- *
+ *
* @return void
* @access public
*/
@@ -419,7 +419,7 @@ class PMA_User_Schema
*
* @param string db name of database selected
* @param integer chpage selected page
- * @param array tabExist
+ * @param array tabExist
* @return void
* @access private
*/
@@ -450,7 +450,7 @@ class PMA_User_Schema
. '</form>';
}
}
-
+
}
/**
@@ -487,14 +487,14 @@ class PMA_User_Schema
$reset_draginit .= ' getElement("table_' . $i .
'").style.top = "' . (15 * $i) . 'px";' . "\n";
$reset_draginit .= ' document.edcoord.elements["c_table_'
. $i . '[x]"].value = "2"' . "\n";
$reset_draginit .= ' document.edcoord.elements["c_table_'
. $i . '[y]"].value = "' . (15 * $i) . '"' .
"\n";
-
+
$local_query = 'SHOW FIELDS FROM '
. PMA_backquote($temp_sh_page['table_name'])
. ' FROM ' . PMA_backquote($db);
$fields_rs = PMA_DBI_query($local_query);
unset($local_query);
$fields_cnt = PMA_DBI_num_rows($fields_rs);
-
+
echo '<div id="table_' . $i . '"
class="pdflayout_table"><u>' . $temp_sh_page['table_name']
. '</u>';
if (isset($with_field_names)) {
while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
@@ -555,7 +555,7 @@ class PMA_User_Schema
/**
* get all the export options and verify
* call and include the appropriate Schema Class depending on $export_type
- *
+ *
* @return void
* @access private
*/
@@ -568,7 +568,7 @@ class PMA_User_Schema
require_once './libraries/Index.class.php';
/**
* default is PDF
- */
+ */
global $db,$export_type;
$export_type = isset($export_type) ? $export_type : 'pdf';
PMA_DBI_select_db($db);
@@ -659,7 +659,7 @@ class PMA_User_Schema
if (isset($this->autoLayoutInternal)) {
/*
* get the tables list who support Internal Relations;
- * This type of relations will be created when
+ * This type of relations will be created when
* you setup the PMA tables correctly
*/
$master_tables = 'SELECT COUNT(master_table), master_table'
@@ -694,8 +694,8 @@ class PMA_User_Schema
}
/*
- * Now merge the master and foreign arrays/tables
- */
+ * Now merge the master and foreign arrays/tables
+ */
foreach ($foreign_tables as $foreign_table) {
if (!in_array($foreign_table, $all_tables)) {
$all_tables[] = $foreign_table;
hooks/post-receive
--
phpMyAdmin