浏览代码

Merge pull request #17414 from ankush/url_enhancements

fix: misc url/routing fixes
version-14
Ankush Menat 2 年前
committed by GitHub
父节点
当前提交
93c2cb757f
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. +5
    -1
      frappe/public/js/frappe/list/list_view.js
  2. +3
    -1
      frappe/public/js/frappe/views/reports/query_report.js

+ 5
- 1
frappe/public/js/frappe/list/list_view.js 查看文件

@@ -1456,7 +1456,11 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
on_update() {}

update_url_with_filters() {
window.history.replaceState(null, null, this.get_url_with_filters());
if (frappe.get_route_str() == this.page_name && !this.report_name) {
// only update URL if the route still matches current page.
// do not update if current list is a "saved report".
window.history.replaceState(null, null, this.get_url_with_filters());
}
}

get_url_with_filters() {


+ 3
- 1
frappe/public/js/frappe/views/reports/query_report.js 查看文件

@@ -58,7 +58,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
}

update_url_with_filters() {
window.history.replaceState(null, null, this.get_url_with_filters());
if (frappe.get_route_str() == this.page_name) {
window.history.replaceState(null, null, this.get_url_with_filters());
}
}

get_url_with_filters() {


正在加载...
取消
保存