ソースを参照

Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui

version-14
prssanna 4年前
コミット
94db4b6c3d
3個のファイルの変更3行の追加3行の削除
  1. +0
    -1
      frappe/desk/doctype/workspace/workspace.js
  2. +2
    -1
      frappe/email/doctype/auto_email_report/auto_email_report.json
  3. +1
    -1
      frappe/model/db_query.py

+ 0
- 1
frappe/desk/doctype/workspace/workspace.js ファイルの表示

@@ -9,7 +9,6 @@ frappe.ui.form.on('Workspace', {
refresh: function(frm) {
frm.enable_save();
frm.get_field("is_standard").toggle(frappe.boot.developer_mode);
frm.get_field("extends_another_page").toggle(frappe.boot.developer_mode);
frm.get_field("developer_mode_only").toggle(frappe.boot.developer_mode);

if (frm.doc.for_user) {


+ 2
- 1
frappe/email/doctype/auto_email_report/auto_email_report.json ファイルの表示

@@ -147,6 +147,7 @@
"label": "Email Settings"
},
{
"description": "For multiple addresses, enter the address on different line. e.g. test@test.com \u23ce test1@test.com",
"fieldname": "email_to",
"fieldtype": "Small Text",
"label": "Email To",
@@ -200,7 +201,7 @@
"read_only": 1
}
],
"modified": "2019-05-09 22:38:27.570890",
"modified": "2021-01-28 15:59:43.151995",
"modified_by": "Administrator",
"module": "Email",
"name": "Auto Email Report",


+ 1
- 1
frappe/model/db_query.py ファイルの表示

@@ -597,7 +597,7 @@ class DatabaseQuery(object):
self.match_conditions.append("`tab{0}`.`owner` = {1}".format(self.doctype,
frappe.db.escape(self.user, percent=False)))
# add user permission only if role has read perm
elif role_permissions.get("read"):
elif role_permissions.get("read") or role_permissions.get("select"):
# get user permissions
user_permissions = frappe.permissions.get_user_permissions(self.user)
self.add_user_permissions(user_permissions)


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