浏览代码

fix: module load issue, tour description and save field overlay

version-14
Jannat Patel 3 年前
父节点
当前提交
c13e1838d7
共有 3 个文件被更改,包括 10 次插入6 次删除
  1. +6
    -5
      frappe/core/form_tour/doctype/doctype.json
  2. +2
    -1
      frappe/public/js/frappe/form/form_tour.js
  3. +2
    -0
      frappe/utils/install.py

+ 6
- 5
frappe/core/form_tour/doctype/doctype.json 查看文件

@@ -6,7 +6,7 @@
"idx": 0,
"include_name_field": 1,
"is_standard": 1,
"modified": "2021-11-24 17:25:18.317075",
"modified": "2021-11-25 17:03:01.646360",
"modified_by": "Administrator",
"module": "Core",
"name": "Doctype",
@@ -15,7 +15,7 @@
"save_on_complete": 1,
"steps": [
{
"description": "Select a Module to which this Doctype would belong",
"description": "Select a Module to which this DocType would belong",
"field": "",
"fieldname": "module",
"fieldtype": "Link",
@@ -27,19 +27,20 @@
"title": "Module"
},
{
"description": "Check this to make the Docytpe as Custom",
"description": "Check this to make the DocType as Custom",
"field": "",
"fieldname": "custom",
"fieldtype": "Check",
"has_next_condition": 0,
"has_next_condition": 1,
"is_table_field": 0,
"label": "Custom?",
"next_step_condition": "eval: doc.custom",
"parent_field": "",
"position": "Left",
"title": "Custom "
},
{
"description": "Add fields to this Custom Doctype",
"description": "A Field (or a docfield) defines a property of a DocType. You can define the column name, label, datatype and more for DocFields. For instance, a ToDo doctype has fields description, status and priority. These ultimately become columns in the database table tabToDo.",
"field": "",
"fieldname": "fields",
"fieldtype": "Table",


+ 2
- 1
frappe/public/js/frappe/form/form_tour.js 查看文件

@@ -18,6 +18,7 @@ frappe.ui.form.FormTour = class FormTour {
// if last step is to save, then attach a listener to save button
if (step.options.is_save_step) {
$(step.options.element).one('click', () => this.driver.reset());
this.driver.overlay.refresh();
}

// focus on input
@@ -54,7 +55,7 @@ frappe.ui.form.FormTour = class FormTour {

include_name_field() {
const name_step = {
"description": "Enter a name",
"description": `Enter a name for this ${this.frm.doctype}`,
"fieldname": "__newname",
"title": "Name",
"position": "right",


+ 2
- 0
frappe/utils/install.py 查看文件

@@ -5,6 +5,8 @@ import getpass
from frappe.utils.password import update_password

def before_install():
frappe.reload_doc("desk", "doctype", "form_tour_step")
frappe.reload_doc("desk", "doctype", "form_tour")
frappe.reload_doc("core", "doctype", "docfield")
frappe.reload_doc("core", "doctype", "docperm")
frappe.reload_doc("core", "doctype", "doctype_action")


正在加载...
取消
保存