Skip to content

Commit cc48950

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) (cherry picked from commit 7a46b30)
1 parent 239e3b5 commit cc48950

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
@@ -742,15 +742,17 @@ function url_pagination_template_context(template, context, defaultPage, default
742742
var page_size = fmt_page_size_request(context, defaultPageSize);
743743
var name_request = fmt_filter_name_request(context, "");
744744
var use_regex = fmt_regex_request(context, "") == "checked";
745-
// rabbitmq/rabbitmq-server#8008: if the expression cannot be compiled to a reg exp,
746-
// assume a regular text filter
747-
var valid_regexp = is_valid_regexp(name_request);
748-
if (!valid_regexp) {
749-
show_popup('warn', fmt_escape_html(`Filter expression '${name_request}' is not a valid regular expression, will perform a regular text query`));
750-
use_regex = false;
751-
}
752-
if (use_regex && valid_regexp) {
753-
name_request = esc(name_request);
745+
if (use_regex) {
746+
// rabbitmq/rabbitmq-server#8008: if the expression cannot be compiled to a reg exp,
747+
// assume a regular text filter
748+
var valid_regexp = is_valid_regexp(name_request);
749+
if (!valid_regexp) {
750+
show_popup('warn', fmt_escape_html(`Filter expression '${name_request}' is not a valid regular expression, will perform a regular text query`));
751+
use_regex = false;
752+
}
753+
if (use_regex && valid_regexp) {
754+
name_request = esc(name_request);
755+
}
754756
}
755757
return '/' + template +
756758
'?page=' + page_number_request +

0 commit comments

Comments
 (0)