gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a message for misconfigured designer (displaywork)

Browse Source 
- When adding a column as display column in designer

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-11-20 12:28:06 +01:00
parent c7e8d50dcb
commit 97ccafa06a
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db_designer.php
View File

@ -64,10 +64,16 @@ if (isset($_POST['operation'])) {
$success = $designerCommon->saveTablePositions($page);
$response->setRequestStatus($success);
} elseif ($_POST['operation'] == 'setDisplayField') {
$designerCommon->saveDisplayField(
$_POST['db'], $_POST['table'], $_POST['field']
[
$success,
$message,
] = $designerCommon->saveDisplayField(
$_POST['db'],
$_POST['table'],
$_POST['field']
);
$response->setRequestStatus(true);
$response->setRequestStatus($success);
$response->addJSON('message', $message);
} elseif ($_POST['operation'] == 'addNewRelation') {
list($success, $message) = $designerCommon->addNewRelation(
$_POST['db'],

17
libraries/classes/Database/Designer/Common.php
View File

@ -505,19 +505,28 @@ class Common
* @param string $table table name
* @param string $field display field name
*
* @return boolean
* @return array<bool,string>
*/
public function saveDisplayField($db, $table, $field)
{
$cfgRelation = $this->relation->getRelationsParam();
if (!$cfgRelation['displaywork']) {
return false;
if (! $cfgRelation['displaywork']) {
return [
false,
_pgettext(
'phpMyAdmin configuration storage is not configured for "Display Features" on designer when user tries to set a display field.',
'phpMyAdmin configuration storage is not configured for "Display Features".'
),
];
}
$upd_query = new Table($table, $db, $GLOBALS['dbi']);
$upd_query->updateDisplayField($field, $cfgRelation);
return true;
return [
true,
null,
];
}
/**