浏览代码

Merge branch 'develop' into mariadb-client-refactor

version-14
gavin 2 年前
committed by GitHub
父节点
当前提交
486f26a1ff
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改,包括 4 次插入6 次删除
  1. +2
    -4
      frappe/app.py
  2. +1
    -1
      frappe/core/doctype/file/utils.py
  3. +1
    -1
      frappe/desk/reportview.py

+ 2
- 4
frappe/app.py 查看文件

@@ -25,7 +25,7 @@ from frappe.utils import get_site_name, sanitize_html
from frappe.utils.error import make_error_snapshot
from frappe.website.serve import get_response

local_manager = LocalManager([frappe.local])
local_manager = LocalManager(frappe.local)

_site = None
_sites_path = os.environ.get("SITES_PATH", ".")
@@ -44,6 +44,7 @@ class RequestContext:
frappe.destroy()


@local_manager.middleware
@Request.application
def application(request):
response = None
@@ -313,9 +314,6 @@ def after_request(rollback):
return rollback


application = local_manager.make_middleware(application)


def serve(
port=8000, profile=False, no_reload=False, no_threading=False, site=None, sites_path="."
):


+ 1
- 1
frappe/core/doctype/file/utils.py 查看文件

@@ -327,7 +327,7 @@ def attach_files_to_document(doc: "File", event) -> None:
folder="Home/Attachments",
)
try:
file.insert()
file.insert(ignore_permissions=True)
except Exception:
doc.log_error("Error Attaching File")



+ 1
- 1
frappe/desk/reportview.py 查看文件

@@ -225,7 +225,7 @@ def parse_json(data):
if isinstance(data.get("or_filters"), str):
data["or_filters"] = json.loads(data["or_filters"])
if isinstance(data.get("fields"), str):
data["fields"] = json.loads(data["fields"])
data["fields"] = ["*"] if data["fields"] == "*" else json.loads(data["fields"])
if isinstance(data.get("docstatus"), str):
data["docstatus"] = json.loads(data["docstatus"])
if isinstance(data.get("save_user_settings"), str):


正在加载...
取消
保存