MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [dbSchemaDiagnostic] Improved wording

pull/5002/head
mokaddem 2019-09-30 11:44:58 +02:00
parent 900317d5fe
commit e124c8186f
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Model/Server.php
View File

@ -4352,7 +4352,10 @@ class Server extends AppModel
// perform schema comparison for tables
foreach($db_expected_schema as $table_name => $columns) {
if (!array_key_exists($table_name, $db_actual_schema)) {
$db_diff[$table_name][] = array('description' => sprintf(__('Table `%s` does not exists'), $table_name));
$db_diff[$table_name][] = array(
'description' => sprintf(__('Table `%s` does not exist'), $table_name),
'column_name' => $table_name,
);
} else {
// perform schema copmarison for table's columns
foreach ($columns as $i => $column) {
@ -4360,7 +4363,7 @@ class Server extends AppModel
$col_diff = array_diff($column, $db_actual_schema[$table_name][$i]);
if (count($col_diff) > 0) {
$db_diff[$table_name][] = array(
'description' => sprintf(__('Column `%s` is different than what is expected'), $column[0]),
'description' => sprintf(__('Column `%s` is different'), $column[0]),
'column_name' => $column[0],
'actual' => $db_actual_schema[$table_name][$i],
'expected' => $column
@ -4368,7 +4371,7 @@ class Server extends AppModel
}
} else {
$db_diff[$table_name][] = array(
'description' => sprintf(__('Column `%s` does not exists in the current database schema'), $column[0]),
'description' => sprintf(__('Column `%s` does not exist'), $column[0]),
'column_name' => $column[0],
'actual' => array('None'),
'expected' => $column
@ -4379,7 +4382,7 @@ class Server extends AppModel
}
foreach(array_diff(array_keys($db_actual_schema), array_keys($db_expected_schema)) as $additional_table) {
$db_diff[$additional_table][] = array(
'description' => sprintf(__('Table `%s` is not registered in the expected database schema'), $additional_table),
'description' => sprintf(__('Table `%s` is an additional table'), $additional_table),
'column_name' => $additional_table,
);
}

13
app/View/Elements/healthElements/db_schema_status.ctp
View File

@ -75,11 +75,14 @@
$sane_description = highlightAndSanitize($column_diagnostic['description'], $column_diagnostic['column_name'], '');
$sane_expected = highlightAndSanitize($column_diagnostic['expected'], $diff_expected);
$sane_actual = highlightAndSanitize($column_diagnostic['actual'], $diff_actual, 'important');
$unique_row = empty($sane_expected) && empty($sane_actual);
$rows .= '<tr>';
$rows .= sprintf('<td>%s</td>', $sane_description);
$rows .= sprintf('<td class="dbColumnDiagnosticRow" data-table="%s" data-index="%s">%s</td>', h($table_name), h($i), implode(' ', $sane_expected));
$rows .= sprintf('<td class="dbColumnDiagnosticRow" data-table="%s" data-index="%s">%s</td>', h($table_name), h($i), implode(' ', $sane_actual));
$rows .= sprintf('<td %s>%s</td>', $unique_row ? 'colspan=3' : '', $sane_description);
if (!$unique_row) {
$rows .= sprintf('<td class="dbColumnDiagnosticRow" data-table="%s" data-index="%s">%s</td>', h($table_name), h($i), implode(' ', $sane_expected));
$rows .= sprintf('<td class="dbColumnDiagnosticRow" data-table="%s" data-index="%s">%s</td>', h($table_name), h($i), implode(' ', $sane_actual));
}
$rows .= '</tr>';
}
}
@ -108,7 +111,7 @@
);
} else {
echo sprintf('<span class="label label-important" style="margin-left: 5px;" title="%s">%s <i class="fas fa-times"></i></span>',
__('The current database version does not matche the expected one'),
__('The current database version does not match the expected one'),
__('Actual DB_version: ') . h($actualDbVersion)
);
}
@ -142,4 +145,4 @@ $(document).ready(function() {
trigger: 'hover'
});
});
</script>
</script>