Hi,

PFA minor patch to fix the issue where logic to extract the error using
RegEX from error message was incorrect in Query tool(History tab).
RM#2700

Another minor issue which I observed on login page is that close button on
alert is little misaligned(screenshot attached).

--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

[image: https://community.postgresrocks.net/]
<https://community.postgresrocks.net/>
diff --git a/web/pgadmin/static/jsx/history/detail/history_error_message.jsx 
b/web/pgadmin/static/jsx/history/detail/history_error_message.jsx
index 0b5e27b..af77a90 100644
--- a/web/pgadmin/static/jsx/history/detail/history_error_message.jsx
+++ b/web/pgadmin/static/jsx/history/detail/history_error_message.jsx
@@ -14,7 +14,9 @@ import Shapes from '../../react_shapes';
 export default class HistoryErrorMessage extends React.Component {
 
   parseErrorMessage(message) {
-    return message.match(/ERROR:\s*([^\n\r]*)/i)[1];
+    return message.match(/ERROR:\s*([^\n\r]*)/i) ?
+           message.match(/ERROR:\s*([^\n\r]*)/i)[1] :
+           message;
   }
 
   render() {
@@ -27,4 +29,4 @@ export default class HistoryErrorMessage extends 
React.Component {
 
 HistoryErrorMessage.propTypes = {
   historyEntry: Shapes.historyDetail,
-};
\ No newline at end of file
+};
diff --git a/web/pgadmin/static/css/bootstrap.overrides.css 
b/web/pgadmin/static/css/bootstrap.overrides.css
index 82c2f4e..73b4fc7 100755
--- a/web/pgadmin/static/css/bootstrap.overrides.css
+++ b/web/pgadmin/static/css/bootstrap.overrides.css
@@ -1341,3 +1341,8 @@ body {
 .override_label_class_font_size {
   font-size: inherit !important;
 }
+
+/* To align 'X' in alert on login page */
+.alert-dismissable, .alert-dismissible {
+  padding-right: 35px !important;
+}

Reply via email to