Skip to content

Commit 7a46b30

Browse files
michaelklishinmergify[bot]
authored andcommitted
Only validate regular expression when the regex box is checked
(cherry picked from commit 65e59f6) (cherry picked from commit d039281)
1 parent a4aeedd commit 7a46b30

File tree

1 file changed

+11
-9
lines changed
  • deps/rabbitmq_management/priv/www/js

1 file changed

+11
-9
lines changed

deps/rabbitmq_management/priv/www/js/main.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -749,15 +749,17 @@ function url_pagination_template_context(template, context, defaultPage, default
749749
var page_size = fmt_page_size_request(context, defaultPageSize);
750750
var name_request = fmt_filter_name_request(context, "");
751751
var use_regex = fmt_regex_request(context, "") == "checked";
752-
// rabbitmq/rabbitmq-server#8008: if the expression cannot be compiled to a reg exp,
753-
// assume a regular text filter
754-
var valid_regexp = is_valid_regexp(name_request);
755-
if (!valid_regexp) {
756-
show_popup('warn', fmt_escape_html(`Filter expression '${name_request}' is not a valid regular expression, will perform a regular text query`));
757-
use_regex = false;
758-
}
759-
if (use_regex && valid_regexp) {
760-
name_request = esc(name_request);
752+
if (use_regex) {
753+
// rabbitmq/rabbitmq-server#8008: if the expression cannot be compiled to a reg exp,
754+
// assume a regular text filter
755+
var valid_regexp = is_valid_regexp(name_request);
756+
if (!valid_regexp) {
757+
show_popup('warn', fmt_escape_html(`Filter expression '${name_request}' is not a valid regular expression, will perform a regular text query`));
758+
use_regex = false;
759+
}
760+
if (use_regex && valid_regexp) {
761+
name_request = esc(name_request);
762+
}
761763
}
762764
return '/' + template +
763765
'?page=' + page_number_request +

0 commit comments

Comments
 (0)