ソースを参照

fix(minor): handle as fieldnames

version-14
Rushabh Mehta 4年前
コミット
0def97543b
1個のファイルの変更6行の追加3行の削除
  1. +6
    -3
      frappe/desk/reportview.py

+ 6
- 3
frappe/desk/reportview.py ファイルの表示

@@ -111,15 +111,18 @@ def extract_fieldname(field):
if ',' in field: if ',' in field:
raise_invalid_field(field) raise_invalid_field(field)


fieldname = field.split(" as ")[0]
fieldname = field
for sep in (' as ', ' AS '):
if sep in fieldname:
fieldname = fieldname.split(sep)[0]


# certain functions allowed, extract the fieldname from the function # certain functions allowed, extract the fieldname from the function
if (fieldname.startswith('count(') if (fieldname.startswith('count(')
or fieldname.startswith('sum(') or fieldname.startswith('sum(')
or fieldname.startswith('avg(')): or fieldname.startswith('avg(')):
if not fieldname.endswith(')'):
if not fieldname.strip().endswith(')'):
raise_invalid_field(field) raise_invalid_field(field)
fieldname = fieldname.split('(', 1)[1].split(')')[0]
fieldname = fieldname.split('(', 1)[1][:-1]


return fieldname return fieldname




読み込み中…
キャンセル
保存