Bläddra i källkod

[fixes] gantt and other minor

version-14
Rushabh Mehta 10 år sedan
förälder
incheckning
ad726e233b
11 ändrade filer med 283 tillägg och 274 borttagningar
  1. +1
    -1
      frappe/__init__.py
  2. +4
    -3
      frappe/core/doctype/defaultvalue/defaultvalue.json
  3. +2
    -2
      frappe/core/doctype/docfield/docfield.json
  4. +2
    -2
      frappe/core/doctype/docperm/docperm.json
  5. +4
    -3
      frappe/core/doctype/page_role/page_role.json
  6. +2
    -2
      frappe/core/doctype/userrole/userrole.json
  7. +239
    -239
      frappe/custom/doctype/customize_form_field/customize_form_field.json
  8. +23
    -22
      frappe/desk/doctype/event_role/event_role.json
  9. +3
    -0
      frappe/public/js/frappe/form/toolbar.js
  10. +1
    -0
      frappe/public/js/frappe/views/ganttview.js
  11. +2
    -0
      frappe/public/js/legacy/form.js

+ 1
- 1
frappe/__init__.py Visa fil

@@ -471,7 +471,7 @@ def delete_doc_if_exists(doctype, name):


def reload_doctype(doctype): def reload_doctype(doctype):
"""Reload DocType from model (`[module]/[doctype]/[name]/[name].json`) files.""" """Reload DocType from model (`[module]/[doctype]/[name]/[name].json`) files."""
reload_doc(db.get_value("DocType", doctype, "module"), "doctype", scrub(doctype))
reload_doc(scrub(db.get_value("DocType", doctype, "module")), "doctype", scrub(doctype))


def reload_doc(module, dt=None, dn=None, force=False): def reload_doc(module, dt=None, dn=None, force=False):
"""Reload Document from model (`[module]/[doctype]/[name]/[name].json`) files. """Reload Document from model (`[module]/[doctype]/[name]/[name].json`) files.


+ 4
- 3
frappe/core/doctype/defaultvalue/defaultvalue.json Visa fil

@@ -1,7 +1,7 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"autoname": "DEF.######",
"creation": "2013-02-22 01:27:32.000000",
"autoname": "hash",
"creation": "2013-02-22 01:27:32",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@@ -39,10 +39,11 @@
"idx": 1, "idx": 1,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2013-12-20 19:23:05.000000",
"modified": "2015-02-19 01:06:59.622792",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Core", "module": "Core",
"name": "DefaultValue", "name": "DefaultValue",
"owner": "Administrator", "owner": "Administrator",
"permissions": [],
"read_only": 0 "read_only": 0
} }

+ 2
- 2
frappe/core/doctype/docfield/docfield.json Visa fil

@@ -1,6 +1,6 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"autoname": "FL.#####",
"autoname": "hash",
"creation": "2013-02-22 01:27:33", "creation": "2013-02-22 01:27:33",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
@@ -314,7 +314,7 @@
"in_dialog": 1, "in_dialog": 1,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2014-12-29 15:31:11.652021",
"modified": "2015-02-19 01:06:59.836515",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Core", "module": "Core",
"name": "DocField", "name": "DocField",


+ 2
- 2
frappe/core/doctype/docperm/docperm.json Visa fil

@@ -1,6 +1,6 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"autoname": "PERM.#####",
"autoname": "hash",
"creation": "2013-02-22 01:27:33", "creation": "2013-02-22 01:27:33",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
@@ -223,7 +223,7 @@
"idx": 1, "idx": 1,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-02-04 04:34:26.227213",
"modified": "2015-02-19 01:06:59.983050",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Core", "module": "Core",
"name": "DocPerm", "name": "DocPerm",


+ 4
- 3
frappe/core/doctype/page_role/page_role.json Visa fil

@@ -1,7 +1,7 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"autoname": "PR.######",
"creation": "2013-02-22 01:27:34.000000",
"autoname": "hash",
"creation": "2013-02-22 01:27:34",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@@ -24,10 +24,11 @@
"idx": 1, "idx": 1,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2013-12-20 19:23:24.000000",
"modified": "2015-02-19 01:07:00.897854",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Core", "module": "Core",
"name": "Page Role", "name": "Page Role",
"owner": "Administrator", "owner": "Administrator",
"permissions": [],
"read_only": 0 "read_only": 0
} }

+ 2
- 2
frappe/core/doctype/userrole/userrole.json Visa fil

@@ -1,6 +1,6 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"autoname": "UR.#####",
"autoname": "hash",
"creation": "2013-02-06 11:30:13", "creation": "2013-02-06 11:30:13",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
@@ -26,7 +26,7 @@
"idx": 1, "idx": 1,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2014-06-17 06:56:28.816283",
"modified": "2015-02-19 01:07:02.561834",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Core", "module": "Core",
"name": "UserRole", "name": "UserRole",


+ 239
- 239
frappe/custom/doctype/customize_form_field/customize_form_field.json Visa fil

@@ -1,295 +1,295 @@
{ {
"allow_copy": 0,
"autoname": "DLF.#####",
"creation": "2013-02-22 01:27:32",
"docstatus": 0,
"doctype": "DocType",
"allow_copy": 0,
"autoname": "hash",
"creation": "2013-02-22 01:27:32",
"docstatus": 0,
"doctype": "DocType",
"fields": [ "fields": [
{ {
"fieldname": "label_and_type",
"fieldtype": "Section Break",
"label": "Label and Type",
"permlevel": 0,
"fieldname": "label_and_type",
"fieldtype": "Section Break",
"label": "Label and Type",
"permlevel": 0,
"precision": "" "precision": ""
},
},
{ {
"fieldname": "label",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Label",
"oldfieldname": "label",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"fieldname": "label",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Label",
"oldfieldname": "label",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"search_index": 1 "search_index": 1
},
},
{ {
"default": "Data",
"fieldname": "fieldtype",
"fieldtype": "Select",
"hidden": 0,
"in_list_view": 1,
"label": "Type",
"oldfieldname": "fieldtype",
"oldfieldtype": "Select",
"options": "Attach\nButton\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime",
"permlevel": 0,
"print_hide": 0,
"reqd": 1,
"default": "Data",
"fieldname": "fieldtype",
"fieldtype": "Select",
"hidden": 0,
"in_list_view": 1,
"label": "Type",
"oldfieldname": "fieldtype",
"oldfieldtype": "Select",
"options": "Attach\nButton\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime",
"permlevel": 0,
"print_hide": 0,
"reqd": 1,
"search_index": 1 "search_index": 1
},
},
{ {
"fieldname": "fieldname",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Name",
"oldfieldname": "fieldname",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"read_only": 1,
"reqd": 0,
"fieldname": "fieldname",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Name",
"oldfieldname": "fieldname",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"read_only": 1,
"reqd": 0,
"search_index": 1 "search_index": 1
},
},
{ {
"fieldname": "reqd",
"fieldtype": "Check",
"hidden": 0,
"label": "Mandatory",
"oldfieldname": "reqd",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"print_width": "50px",
"reqd": 0,
"search_index": 0,
"fieldname": "reqd",
"fieldtype": "Check",
"hidden": 0,
"label": "Mandatory",
"oldfieldname": "reqd",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"print_width": "50px",
"reqd": 0,
"search_index": 0,
"width": "50px" "width": "50px"
},
},
{ {
"fieldname": "unique",
"fieldtype": "Check",
"label": "Unique",
"permlevel": 0,
"fieldname": "unique",
"fieldtype": "Check",
"label": "Unique",
"permlevel": 0,
"precision": "" "precision": ""
},
},
{ {
"fieldname": "in_list_view",
"fieldtype": "Check",
"label": "In List View",
"fieldname": "in_list_view",
"fieldtype": "Check",
"label": "In List View",
"permlevel": 0 "permlevel": 0
},
},
{ {
"fieldname": "column_break_7",
"fieldtype": "Column Break",
"permlevel": 0,
"fieldname": "column_break_7",
"fieldtype": "Column Break",
"permlevel": 0,
"precision": "" "precision": ""
},
},
{ {
"depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
"description": "Set non-standard precision for a Float or Currency field",
"fieldname": "precision",
"fieldtype": "Select",
"label": "Precision",
"options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9",
"permlevel": 0,
"depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
"description": "Set non-standard precision for a Float or Currency field",
"fieldname": "precision",
"fieldtype": "Select",
"label": "Precision",
"options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9",
"permlevel": 0,
"precision": "" "precision": ""
},
},
{ {
"description": "For Links, enter the DocType as range\nFor Select, enter list of Options separated by comma",
"fieldname": "options",
"fieldtype": "Text",
"hidden": 0,
"in_list_view": 1,
"label": "Options",
"oldfieldname": "options",
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"description": "For Links, enter the DocType as range\nFor Select, enter list of Options separated by comma",
"fieldname": "options",
"fieldtype": "Text",
"hidden": 0,
"in_list_view": 1,
"label": "Options",
"oldfieldname": "options",
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"search_index": 0 "search_index": 0
},
},
{ {
"fieldname": "permissions",
"fieldtype": "Section Break",
"label": "Permissions",
"permlevel": 0,
"fieldname": "permissions",
"fieldtype": "Section Break",
"label": "Permissions",
"permlevel": 0,
"precision": "" "precision": ""
},
},
{ {
"description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): <br>\nmyfield\neval:doc.myfield=='My Value'<br>\neval:doc.age>18",
"fieldname": "depends_on",
"fieldtype": "Data",
"hidden": 0,
"label": "Depends On",
"oldfieldname": "depends_on",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): <br>\nmyfield\neval:doc.myfield=='My Value'<br>\neval:doc.age>18",
"fieldname": "depends_on",
"fieldtype": "Data",
"hidden": 0,
"label": "Depends On",
"oldfieldname": "depends_on",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"reqd": 0 "reqd": 0
},
},
{ {
"default": "0",
"fieldname": "permlevel",
"fieldtype": "Int",
"hidden": 0,
"in_list_view": 1,
"label": "Perm Level",
"oldfieldname": "permlevel",
"oldfieldtype": "Int",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"default": "0",
"fieldname": "permlevel",
"fieldtype": "Int",
"hidden": 0,
"in_list_view": 1,
"label": "Perm Level",
"oldfieldname": "permlevel",
"oldfieldtype": "Int",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"search_index": 0 "search_index": 0
},
},
{ {
"fieldname": "hidden",
"fieldtype": "Check",
"hidden": 0,
"label": "Hidden",
"oldfieldname": "hidden",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"print_width": "50px",
"reqd": 0,
"search_index": 0,
"fieldname": "hidden",
"fieldtype": "Check",
"hidden": 0,
"label": "Hidden",
"oldfieldname": "hidden",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"print_width": "50px",
"reqd": 0,
"search_index": 0,
"width": "50px" "width": "50px"
},
},
{ {
"fieldname": "column_break_14",
"fieldtype": "Column Break",
"permlevel": 0,
"fieldname": "column_break_14",
"fieldtype": "Column Break",
"permlevel": 0,
"precision": "" "precision": ""
},
},
{ {
"fieldname": "ignore_user_permissions",
"fieldtype": "Check",
"label": "Ignore User Permissions",
"fieldname": "ignore_user_permissions",
"fieldtype": "Check",
"label": "Ignore User Permissions",
"permlevel": 0 "permlevel": 0
},
},
{ {
"fieldname": "allow_on_submit",
"fieldtype": "Check",
"hidden": 0,
"label": "Allow on Submit",
"oldfieldname": "allow_on_submit",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"fieldname": "allow_on_submit",
"fieldtype": "Check",
"hidden": 0,
"label": "Allow on Submit",
"oldfieldname": "allow_on_submit",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"reqd": 0 "reqd": 0
},
},
{ {
"fieldname": "report_hide",
"fieldtype": "Check",
"hidden": 0,
"label": "Report Hide",
"oldfieldname": "report_hide",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"fieldname": "report_hide",
"fieldtype": "Check",
"hidden": 0,
"label": "Report Hide",
"oldfieldname": "report_hide",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"reqd": 0 "reqd": 0
},
},
{ {
"fieldname": "display",
"fieldtype": "Section Break",
"label": "Display",
"permlevel": 0,
"fieldname": "display",
"fieldtype": "Section Break",
"label": "Display",
"permlevel": 0,
"precision": "" "precision": ""
},
},
{ {
"fieldname": "default",
"fieldtype": "Text",
"hidden": 0,
"label": "Default",
"oldfieldname": "default",
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"fieldname": "default",
"fieldtype": "Text",
"hidden": 0,
"label": "Default",
"oldfieldname": "default",
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"search_index": 0 "search_index": 0
},
},
{ {
"fieldname": "in_filter",
"fieldtype": "Check",
"hidden": 0,
"label": "In Filter",
"oldfieldname": "in_filter",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"print_width": "50px",
"reqd": 0,
"fieldname": "in_filter",
"fieldtype": "Check",
"hidden": 0,
"label": "In Filter",
"oldfieldname": "in_filter",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"print_width": "50px",
"reqd": 0,
"width": "50px" "width": "50px"
},
},
{ {
"fieldname": "column_break_21",
"fieldtype": "Column Break",
"permlevel": 0,
"fieldname": "column_break_21",
"fieldtype": "Column Break",
"permlevel": 0,
"precision": "" "precision": ""
},
},
{ {
"fieldname": "description",
"fieldtype": "Text",
"hidden": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
"print_width": "300px",
"reqd": 0,
"fieldname": "description",
"fieldtype": "Text",
"hidden": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
"print_width": "300px",
"reqd": 0,
"width": "300px" "width": "300px"
},
},
{ {
"fieldname": "print_hide",
"fieldtype": "Check",
"hidden": 0,
"label": "Print Hide",
"oldfieldname": "print_hide",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"fieldname": "print_hide",
"fieldtype": "Check",
"hidden": 0,
"label": "Print Hide",
"oldfieldname": "print_hide",
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 0,
"reqd": 0,
"search_index": 0 "search_index": 0
},
},
{ {
"description": "Print Width of the field, if the field is a column in a table",
"fieldname": "print_width",
"fieldtype": "Data",
"label": "Print Width",
"permlevel": 0,
"print_width": "50px",
"description": "Print Width of the field, if the field is a column in a table",
"fieldname": "print_width",
"fieldtype": "Data",
"label": "Print Width",
"permlevel": 0,
"print_width": "50px",
"width": "50px" "width": "50px"
},
},
{ {
"fieldname": "width",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Width",
"oldfieldname": "width",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_width": "50px",
"reqd": 0,
"search_index": 0,
"fieldname": "width",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Width",
"oldfieldname": "width",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_width": "50px",
"reqd": 0,
"search_index": 0,
"width": "50px" "width": "50px"
} }
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 1,
"issingle": 0,
"istable": 1,
"modified": "2014-09-26 05:06:37.372436",
"modified_by": "Administrator",
"module": "Custom",
"name": "Customize Form Field",
"owner": "Administrator",
"permissions": [],
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 1,
"issingle": 0,
"istable": 1,
"modified": "2015-02-19 01:06:59.524746",
"modified_by": "Administrator",
"module": "Custom",
"name": "Customize Form Field",
"owner": "Administrator",
"permissions": [],
"read_only": 0 "read_only": 0
}
}

+ 23
- 22
frappe/desk/doctype/event_role/event_role.json Visa fil

@@ -1,27 +1,28 @@
{ {
"autoname": "__EVR.#####",
"creation": "2013-02-22 01:27:33.000000",
"docstatus": 0,
"doctype": "DocType",
"autoname": "hash",
"creation": "2013-02-22 01:27:33",
"docstatus": 0,
"doctype": "DocType",
"fields": [ "fields": [
{ {
"fieldname": "role",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Role",
"oldfieldname": "role",
"oldfieldtype": "Link",
"options": "Role",
"permlevel": 0,
"print_width": "240px",
"fieldname": "role",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Role",
"oldfieldname": "role",
"oldfieldtype": "Link",
"options": "Role",
"permlevel": 0,
"print_width": "240px",
"width": "240px" "width": "240px"
} }
],
"idx": 1,
"istable": 1,
"modified": "2013-12-20 19:23:12.000001",
"modified_by": "Administrator",
"module": "Desk",
"name": "Event Role",
"owner": "Administrator"
}
],
"idx": 1,
"istable": 1,
"modified": "2015-02-19 01:07:00.166770",
"modified_by": "Administrator",
"module": "Desk",
"name": "Event Role",
"owner": "Administrator",
"permissions": []
}

+ 3
- 0
frappe/public/js/frappe/form/toolbar.js Visa fil

@@ -38,6 +38,9 @@ frappe.ui.form.Toolbar = Class.extend({
} }
var me = this; var me = this;
this.page.set_title(title); this.page.set_title(title);
if(this.frm.meta.title_field) {
document.title = title + " - " + this.frm.docname;
}
this.set_indicator(); this.set_indicator();
}, },
get_dropdown_menu: function(label) { get_dropdown_menu: function(label) {


+ 1
- 0
frappe/public/js/frappe/views/ganttview.js Visa fil

@@ -84,6 +84,7 @@ frappe.views.Gantt = Class.extend({
scale: "days", scale: "days",
minScale: "hours", minScale: "hours",
maxScale: "months", maxScale: "months",
itemsPerPage: 20,
onItemClick: function(data) { onItemClick: function(data) {
frappe.set_route('Form', me.doctype, data.name); frappe.set_route('Form', me.doctype, data.name);
}, },


+ 2
- 0
frappe/public/js/legacy/form.js Visa fil

@@ -579,6 +579,7 @@ _f.Frm.prototype._save = function(save_action, callback, btn, on_error) {
// validate // validate
validated = true; validated = true;
this.script_manager.trigger("validate"); this.script_manager.trigger("validate");
this.script_manager.trigger("before_save");


if(!validated) { if(!validated) {
if(on_error) if(on_error)
@@ -589,6 +590,7 @@ _f.Frm.prototype._save = function(save_action, callback, btn, on_error) {


var after_save = function(r) { var after_save = function(r) {
if(!r.exc) { if(!r.exc) {
me.script_manager.trigger("after_save");
me.refresh(); me.refresh();
} else { } else {
if(on_error) if(on_error)


Laddar…
Avbryt
Spara