+ 
-
+
diff --git a/cypress/fixtures/child_table_doctype.js b/cypress/fixtures/child_table_doctype.js
new file mode 100644
index 0000000000..f65e5d1765
--- /dev/null
+++ b/cypress/fixtures/child_table_doctype.js
@@ -0,0 +1,30 @@
+export default {
+ name: "Child Table Doctype",
+ actions: [],
+ custom: 1,
+ autoname: "field:title",
+ creation: "2022-02-09 20:15:21.242213",
+ doctype: "DocType",
+ editable_grid: 1,
+ engine: "InnoDB",
+ fields: [
+ {
+ fieldname: "title",
+ fieldtype: "Data",
+ in_list_view: 1,
+ label: "Title",
+ unique: 1
+ }
+ ],
+ links: [],
+ istable: 1,
+ modified: "2022-02-10 12:03:12.603763",
+ modified_by: "Administrator",
+ module: "Custom",
+ naming_rule: "By fieldname",
+ owner: "Administrator",
+ permissions: [],
+ sort_field: 'modified',
+ sort_order: 'ASC',
+ track_changes: 1
+};
\ No newline at end of file
diff --git a/cypress/fixtures/doctype_to_link.js b/cypress/fixtures/doctype_to_link.js
new file mode 100644
index 0000000000..f5335b1755
--- /dev/null
+++ b/cypress/fixtures/doctype_to_link.js
@@ -0,0 +1,45 @@
+export default {
+ name: "Doctype to Link",
+ actions: [],
+ custom: 1,
+ naming_rule: "By fieldname",
+ autoname: "field:title",
+ creation: "2022-02-09 20:15:21.242213",
+ doctype: "DocType",
+ editable_grid: 1,
+ engine: "InnoDB",
+ fields: [
+ {
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "label": "Title",
+ "unique": 1
+ }
+ ],
+ links: [
+ {
+ "group": "Child Doctype",
+ "link_doctype": "Doctype With Child Table",
+ "link_fieldname": "title"
+ }
+ ],
+ modified: "2022-02-10 12:03:12.603763",
+ modified_by: "Administrator",
+ module: "Custom",
+ owner: "Administrator",
+ permissions: [
+ {
+ create: 1,
+ delete: 1,
+ email: 1,
+ print: 1,
+ read: 1,
+ role: 'System Manager',
+ share: 1,
+ write: 1
+ }
+ ],
+ sort_field: 'modified',
+ sort_order: 'ASC',
+ track_changes: 1
+};
\ No newline at end of file
diff --git a/cypress/fixtures/doctype_with_child_table.js b/cypress/fixtures/doctype_with_child_table.js
new file mode 100644
index 0000000000..bbb2127448
--- /dev/null
+++ b/cypress/fixtures/doctype_with_child_table.js
@@ -0,0 +1,46 @@
+export default {
+ name: "Doctype With Child Table",
+ actions: [],
+ custom: 1,
+ autoname: "field:title",
+ creation: "2022-02-09 20:15:21.242213",
+ doctype: "DocType",
+ editable_grid: 1,
+ engine: "InnoDB",
+ fields: [
+ {
+ fieldname: "title",
+ fieldtype: "Data",
+ label: "Title",
+ unique: 1
+ },
+ {
+ fieldname: "child_table",
+ fieldtype: "Table",
+ label: "Child Table",
+ options: "Child Table Doctype",
+ reqd: 1
+ }
+ ],
+ links: [],
+ modified: "2022-02-10 12:03:12.603763",
+ modified_by: "Administrator",
+ module: "Custom",
+ naming_rule: "By fieldname",
+ owner: "Administrator",
+ permissions: [
+ {
+ create: 1,
+ delete: 1,
+ email: 1,
+ print: 1,
+ read: 1,
+ role: 'System Manager',
+ share: 1,
+ write: 1
+ }
+ ],
+ sort_field: 'modified',
+ sort_order: 'ASC',
+ track_changes: 1
+};
diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index bfa70ad338..7a7e94d2f5 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -95,6 +95,51 @@ context('Control Link', () => {
});
});
+ it('show title field in link', () => {
+ get_dialog_with_link().as('dialog');
+
+ cy.insert_doc("Property Setter", {
+ "doctype": "Property Setter",
+ "doc_type": "ToDo",
+ "property": "show_title_field_in_link",
+ "property_type": "Check",
+ "doctype_or_field": "DocType",
+ "value": "1"
+ }, true);
+
+ cy.window().its('frappe').then(frappe => {
+ if (!frappe.boot) {
+ frappe.boot = {
+ link_title_doctypes: ['ToDo']
+ };
+ } else {
+ frappe.boot.link_title_doctypes = ['ToDo'];
+ }
+ });
+
+ cy.intercept('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
+
+ cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
+ cy.wait('@search_link');
+ cy.get('@input').type('todo for link');
+ cy.wait('@search_link');
+ cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible');
+ cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 });
+ cy.get('.frappe-control[data-fieldname=link] input').blur();
+ cy.get('@dialog').then(dialog => {
+ cy.get('@todos').then(todos => {
+ let field = dialog.get_field('link');
+ let value = field.get_value();
+ let label = field.get_label_value();
+
+ expect(value).to.eq(todos[0]);
+ expect(label).to.eq('this is a test todo for link');
+
+ cy.remove_doc("Property Setter", "ToDo-main-show_title_field_in_link");
+ });
+ });
+ });
+
it('should update dependant fields (via fetch_from)', () => {
cy.get('@todos').then(todos => {
cy.visit(`/app/todo/${todos[0]}`);
diff --git a/cypress/integration/dashboard_links.js b/cypress/integration/dashboard_links.js
index 16ffd41cf4..93d10cf1fd 100644
--- a/cypress/integration/dashboard_links.js
+++ b/cypress/integration/dashboard_links.js
@@ -1,7 +1,21 @@
+import doctype_with_child_table from '../fixtures/doctype_with_child_table';
+import child_table_doctype from '../fixtures/child_table_doctype';
+import doctype_to_link from '../fixtures/doctype_to_link';
+const doctype_to_link_name = doctype_to_link.name;
+const child_table_doctype_name = child_table_doctype.name;
+
context('Dashboard links', () => {
before(() => {
cy.visit('/login');
cy.login();
+ cy.insert_doc('DocType', child_table_doctype, true);
+ cy.insert_doc('DocType', doctype_with_child_table, true);
+ cy.insert_doc('DocType', doctype_to_link, true);
+ return cy.window().its('frappe').then(frappe => {
+ return frappe.xcall("frappe.tests.ui_test_helpers.update_child_table", {
+ name: child_table_doctype_name
+ });
+ });
});
it('Adding a new contact, checking for the counter on the dashboard and deleting the created contact', () => {
@@ -62,4 +76,14 @@ context('Dashboard links', () => {
cy.findByText('Website Analytics');
});
});
+
+ it('check if child table is populated with linked field on creation from dashboard link', () => {
+ cy.new_form(doctype_to_link_name);
+ cy.fill_field("title", "Test Linking");
+ cy.findByRole("button", {name: "Save"}).click();
+
+ cy.get('.document-link .btn-new').click();
+ cy.get('.frappe-control[data-fieldname="child_table"] .rows .data-row .col[data-fieldname="doctype_to_link"]')
+ .should('contain.text', 'Test Linking');
+ });
});
diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js
index 9aa6b5d89d..12f54f2b6e 100644
--- a/cypress/integration/depends_on.js
+++ b/cypress/integration/depends_on.js
@@ -55,10 +55,31 @@ context('Depends On', () => {
'read_only_depends_on': "eval:doc.test_field=='Some Other Value'",
'options': "Child Test Depends On"
},
+ {
+ "label": "Dependent Tab",
+ "fieldname": "dependent_tab",
+ "fieldtype": "Tab Break",
+ "depends_on": "eval:doc.test_field=='Show Tab'"
+ },
+ {
+ "fieldname": "tab_section",
+ "fieldtype": "Section Break",
+ },
+ {
+ "label": "Field in Tab",
+ "fieldname": "field_in_tab",
+ "fieldtype": "Data",
+ }
]
});
});
});
+ it('should show the tab on other setting field value', () => {
+ cy.new_form('Test Depends On');
+ cy.fill_field('test_field', 'Show Tab');
+ cy.get('body').click();
+ cy.findByRole("tab", {name: "Dependent Tab"}).should('be.visible');
+ });
it('should set the field as mandatory depending on other fields value', () => {
cy.new_form('Test Depends On');
cy.fill_field('test_field', 'Some Value');
diff --git a/cypress/integration/grid.js b/cypress/integration/grid.js
new file mode 100644
index 0000000000..4fa52712cf
--- /dev/null
+++ b/cypress/integration/grid.js
@@ -0,0 +1,92 @@
+context('Grid', () => {
+ beforeEach(() => {
+ cy.login();
+ cy.visit('/app/website');
+ });
+ before(() => {
+ cy.login();
+ cy.visit('/app/website');
+ return cy.window().its('frappe').then(frappe => {
+ return frappe.call("frappe.tests.ui_test_helpers.create_contact_phone_nos_records");
+ });
+ });
+ it('update docfield property using update_docfield_property', () => {
+ cy.visit('/app/contact/Test Contact');
+ cy.window().its("cur_frm").then(frm => {
+ cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table');
+ let field = frm.get_field("phone_nos");
+ field.grid.update_docfield_property("is_primary_phone", "hidden", true);
+
+ cy.get('@table').find('[data-idx="1"] .edit-grid-row').click();
+ cy.get('.grid-row-open').as('table-form');
+ cy.get('@table-form').find('.frappe-control[data-fieldname="is_primary_phone"]').should("be.hidden");
+ cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+ cy.get('@table').find('[data-idx="2"] .edit-grid-row').click();
+ cy.get('.grid-row-open').as('table-form');
+ cy.get('@table-form').find('.frappe-control[data-fieldname="is_primary_phone"]').should("be.hidden");
+ cy.get('@table-form').find('.grid-footer-toolbar').click();
+ });
+ });
+ it('update docfield property using toggle_display', () => {
+ cy.visit('/app/contact/Test Contact');
+ cy.window().its("cur_frm").then(frm => {
+ cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table');
+ let field = frm.get_field("phone_nos");
+ field.grid.toggle_display("is_primary_mobile_no", false);
+
+ cy.get('@table').find('[data-idx="1"] .edit-grid-row').click();
+ cy.get('.grid-row-open').as('table-form');
+ cy.get('@table-form').find('.frappe-control[data-fieldname="is_primary_mobile_no"]').should("be.hidden");
+ cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+ cy.get('@table').find('[data-idx="2"] .edit-grid-row').click();
+ cy.get('.grid-row-open').as('table-form');
+ cy.get('@table-form').find('.frappe-control[data-fieldname="is_primary_mobile_no"]').should("be.hidden");
+ cy.get('@table-form').find('.grid-footer-toolbar').click();
+ });
+ });
+ it('update docfield property using toggle_enable', () => {
+ cy.visit('/app/contact/Test Contact');
+ cy.window().its("cur_frm").then(frm => {
+ cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table');
+ let field = frm.get_field("phone_nos");
+ field.grid.toggle_enable("phone", false);
+
+
+ cy.get('@table').find('[data-idx="1"] .edit-grid-row').click();
+ cy.get('.grid-row-open').as('table-form');
+ cy.get('@table-form').find('.frappe-control[data-fieldname="phone"] .control-value').should('have.class', 'like-disabled-input');
+ cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+ cy.get('@table').find('[data-idx="2"] .edit-grid-row').click();
+ cy.get('.grid-row-open').as('table-form');
+ cy.get('@table-form').find('.frappe-control[data-fieldname="phone"] .control-value').should('have.class', 'like-disabled-input');
+ cy.get('@table-form').find('.grid-footer-toolbar').click();
+ });
+ });
+ it('update docfield property using toggle_reqd', () => {
+ cy.visit('/app/contact/Test Contact');
+ cy.window().its("cur_frm").then(frm => {
+ cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table');
+ let field = frm.get_field("phone_nos");
+ field.grid.toggle_reqd("phone", false);
+
+ cy.get('@table').find('[data-idx="1"] .edit-grid-row').click();
+ cy.get('.grid-row-open').as('table-form');
+ cy.get_field("phone").as('phone-field');
+ cy.get('@phone-field').focus().clear().wait(500).blur();
+ cy.get('@phone-field').should("not.have.class", "has-error");
+ cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+ cy.get('@table').find('[data-idx="2"] .edit-grid-row').click();
+ cy.get('.grid-row-open').as('table-form');
+ cy.get_field("phone").as('phone-field');
+ cy.get('@phone-field').focus().clear().wait(500).blur();
+ cy.get('@phone-field').should("not.have.class", "has-error");
+ cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+ });
+ });
+});
+
diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js
index b161af2df7..3e0d1c9d50 100644
--- a/cypress/integration/list_view.js
+++ b/cypress/integration/list_view.js
@@ -12,6 +12,7 @@ context('List View', () => {
cy.get('.list-row-container .list-row-checkbox').click({ multiple: true, force: true });
cy.get('.actions-btn-group button').contains('Actions').should('be.visible');
cy.intercept('/api/method/frappe.desk.reportview.get').as('list-refresh');
+ cy.wait(3000); // wait before you hit another refresh
cy.get('button[data-original-title="Refresh"]').click();
cy.wait('@list-refresh');
cy.get('.list-row-container .list-row-checkbox:checked').should('be.visible');
diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js
index 0253e8fd43..6e3a28bbfc 100644
--- a/cypress/integration/report_view.js
+++ b/cypress/integration/report_view.js
@@ -11,30 +11,64 @@ context('Report View', () => {
'title': 'Doc 1',
'description': 'Random Text',
'enabled': 0,
- // submit document
- 'docstatus': 1
- }, true).as('doc');
+ 'docstatus': 1 // submit document
+ }, true);
+ return cy.window().its('frappe').then(frappe => {
+ return frappe.call("frappe.tests.ui_test_helpers.create_multiple_contact_records");
+ });
});
+
it('Field with enabled allow_on_submit should be editable.', () => {
cy.intercept('POST', 'api/method/frappe.client.set_value').as('value-update');
cy.visit(`/app/List/${doctype_name}/Report`);
+
// check status column added from docstatus
cy.get('.dt-row-0 > .dt-cell--col-3').should('contain', 'Submitted');
let cell = cy.get('.dt-row-0 > .dt-cell--col-4');
+
// select the cell
cell.dblclick();
cell.get('.dt-cell__edit--col-4').findByRole('checkbox').check({ force: true });
+ cy.get('.dt-row-0 > .dt-cell--col-3').click(); // click outside
+
cy.wait('@value-update');
- cy.get('@doc').then(doc => {
- cy.call('frappe.client.get_value', {
- doctype: doc.doctype,
- filters: {
- name: doc.name,
- },
- fieldname: 'enabled'
- }).then(r => {
- expect(r.message.enabled).to.equals(1);
- });
+
+ cy.call('frappe.client.get_value', {
+ doctype: doctype_name,
+ filters: {
+ title: 'Doc 1',
+ },
+ fieldname: 'enabled'
+ }).then(r => {
+ expect(r.message.enabled).to.equals(1);
});
});
-});
\ No newline at end of file
+
+ it('test load more with count selection buttons', () => {
+ cy.visit('/app/contact/view/report');
+
+ cy.get('.list-paging-area .list-count').should('contain.text', '20 of');
+ cy.get('.list-paging-area .btn-more').click();
+ cy.get('.list-paging-area .list-count').should('contain.text', '40 of');
+ cy.get('.list-paging-area .btn-more').click();
+ cy.get('.list-paging-area .list-count').should('contain.text', '60 of');
+
+ cy.get('.list-paging-area .btn-group .btn-paging[data-value="100"]').click();
+
+ cy.get('.list-paging-area .list-count').should('contain.text', '100 of');
+ cy.get('.list-paging-area .btn-more').click();
+ cy.get('.list-paging-area .list-count').should('contain.text', '200 of');
+ cy.get('.list-paging-area .btn-more').click();
+ cy.get('.list-paging-area .list-count').should('contain.text', '300 of');
+
+ // check if refresh works after load more
+ cy.get('.page-head .standard-actions [data-original-title="Refresh"]').click();
+ cy.get('.list-paging-area .list-count').should('contain.text', '300 of');
+
+ cy.get('.list-paging-area .btn-group .btn-paging[data-value="500"]').click();
+
+ cy.get('.list-paging-area .list-count').should('contain.text', '500 of');
+ cy.get('.list-paging-area .btn-more').click();
+ cy.get('.list-paging-area .list-count').should('contain.text', '1000 of');
+ });
+});
diff --git a/frappe/api.py b/frappe/api.py
index e7f7bf5a04..226853c47b 100644
--- a/frappe/api.py
+++ b/frappe/api.py
@@ -159,7 +159,10 @@ def get_request_form_data():
else:
data = frappe.local.form_dict.data
- return frappe.parse_json(data)
+ try:
+ return frappe.parse_json(data)
+ except ValueError:
+ return frappe.local.form_dict
def validate_auth():
@@ -208,7 +211,6 @@ def validate_oauth(authorization_header):
pass
-
def validate_auth_via_api_keys(authorization_header):
"""
Authenticate request using API keys and set session user
diff --git a/frappe/boot.py b/frappe/boot.py
index 7f62d96cae..524913059c 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -89,6 +89,7 @@ def get_bootinfo():
bootinfo.additional_filters_config = get_additional_filters_from_hooks()
bootinfo.desk_settings = get_desk_settings()
bootinfo.app_logo_url = get_app_logo()
+ bootinfo.link_title_doctypes = get_link_title_doctypes()
return bootinfo
@@ -324,6 +325,15 @@ def get_desk_settings():
def get_notification_settings():
return frappe.get_cached_doc('Notification Settings', frappe.session.user)
+def get_link_title_doctypes():
+ dts = frappe.get_all("DocType", {"show_title_field_in_link": 1})
+ custom_dts = frappe.get_all(
+ "Property Setter",
+ {"property": "show_title_field_in_link", "value": "1"},
+ ["doc_type as name"],
+ )
+ return [d.name for d in dts + custom_dts if d]
+
def set_time_zone(bootinfo):
bootinfo.time_zone = {
"system": get_time_zone(),
diff --git a/frappe/build.py b/frappe/build.py
index 6b93b8b93a..7a06ee3a22 100644
--- a/frappe/build.py
+++ b/frappe/build.py
@@ -1,25 +1,21 @@
-# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE
import os
-import re
-import json
import shutil
+import re
import subprocess
+from distutils.spawn import find_executable
from subprocess import getoutput
-from io import StringIO
from tempfile import mkdtemp, mktemp
-from distutils.spawn import find_executable
-
-import frappe
-from frappe.utils.minify import JavascriptMinify
+from urllib.parse import urlparse
import click
import psutil
-from urllib.parse import urlparse
-from semantic_version import Version
from requests import head
from requests.exceptions import HTTPError
+from semantic_version import Version
+import frappe
timestamps = {}
app_paths = None
@@ -32,6 +28,7 @@ class AssetsNotDownloadedError(Exception):
class AssetsDontExistError(HTTPError):
pass
+
def download_file(url, prefix):
from requests import get
@@ -277,12 +274,14 @@ def check_node_executable():
click.echo(f"{warn} Please install yarn using below command and try again.\nnpm install -g yarn")
click.echo()
+
def get_node_env():
node_env = {
"NODE_OPTIONS": f"--max_old_space_size={get_safe_max_old_space_size()}"
}
return node_env
+
def get_safe_max_old_space_size():
safe_max_old_space_size = 0
try:
@@ -296,6 +295,7 @@ def get_safe_max_old_space_size():
return safe_max_old_space_size
+
def generate_assets_map():
symlinks = {}
@@ -344,7 +344,6 @@ def clear_broken_symlinks():
os.remove(path)
-
def unstrip(message: str) -> str:
"""Pads input string on the right side until the last available column in the terminal
"""
@@ -397,94 +396,6 @@ def link_assets_dir(source, target, hard_link=False):
symlink(source, target, overwrite=True)
-def build(no_compress=False, verbose=False):
- for target, sources in get_build_maps().items():
- pack(os.path.join(assets_path, target), sources, no_compress, verbose)
-
-
-def get_build_maps():
- """get all build.jsons with absolute paths"""
- # framework js and css files
-
- build_maps = {}
- for app_path in app_paths:
- path = os.path.join(app_path, "public", "build.json")
- if os.path.exists(path):
- with open(path) as f:
- try:
- for target, sources in (json.loads(f.read() or "{}")).items():
- # update app path
- source_paths = []
- for source in sources:
- if isinstance(source, list):
- s = frappe.get_pymodule_path(source[0], *source[1].split("/"))
- else:
- s = os.path.join(app_path, source)
- source_paths.append(s)
-
- build_maps[target] = source_paths
- except ValueError as e:
- print(path)
- print("JSON syntax error {0}".format(str(e)))
- return build_maps
-
-
-def pack(target, sources, no_compress, verbose):
- outtype, outtxt = target.split(".")[-1], ""
- jsm = JavascriptMinify()
-
- for f in sources:
- suffix = None
- if ":" in f:
- f, suffix = f.split(":")
- if not os.path.exists(f) or os.path.isdir(f):
- print("did not find " + f)
- continue
- timestamps[f] = os.path.getmtime(f)
- try:
- with open(f, "r") as sourcefile:
- data = str(sourcefile.read(), "utf-8", errors="ignore")
-
- extn = f.rsplit(".", 1)[1]
-
- if (
- outtype == "js"
- and extn == "js"
- and (not no_compress)
- and suffix != "concat"
- and (".min." not in f)
- ):
- tmpin, tmpout = StringIO(data.encode("utf-8")), StringIO()
- jsm.minify(tmpin, tmpout)
- minified = tmpout.getvalue()
- if minified:
- outtxt += str(minified or "", "utf-8").strip("\n") + ";"
-
- if verbose:
- print("{0}: {1}k".format(f, int(len(minified) / 1024)))
- elif outtype == "js" and extn == "html":
- # add to frappe.templates
- outtxt += html_to_js_template(f, data)
- else:
- outtxt += "\n/*\n *\t%s\n */" % f
- outtxt += "\n" + data + "\n"
-
- except Exception:
- print("--Error in:" + f + "--")
- print(frappe.get_traceback())
-
- with open(target, "w") as f:
- f.write(outtxt.encode("utf-8"))
-
- print("Wrote %s - %sk" % (target, str(int(os.path.getsize(target) / 1024))))
-
-
-def html_to_js_template(path, content):
- """returns HTML template content as Javascript code, adding it to `frappe.templates`"""
- return """frappe.templates["{key}"] = '{content}';\n""".format(
- key=path.rsplit("/", 1)[-1][:-5], content=scrub_html_template(content))
-
-
def scrub_html_template(content):
"""Returns HTML content with removed whitespace and comments"""
# remove whitespace to a single space
@@ -496,37 +407,7 @@ def scrub_html_template(content):
return content.replace("'", "\'")
-def files_dirty():
- for target, sources in get_build_maps().items():
- for f in sources:
- if ":" in f:
- f, suffix = f.split(":")
- if not os.path.exists(f) or os.path.isdir(f):
- continue
- if os.path.getmtime(f) != timestamps.get(f):
- print(f + " dirty")
- return True
- else:
- return False
-
-
-def compile_less():
- if not find_executable("lessc"):
- return
-
- for path in app_paths:
- less_path = os.path.join(path, "public", "less")
- if os.path.exists(less_path):
- for fname in os.listdir(less_path):
- if fname.endswith(".less") and fname != "variables.less":
- fpath = os.path.join(less_path, fname)
- mtime = os.path.getmtime(fpath)
- if fpath in timestamps and mtime == timestamps[fpath]:
- continue
-
- timestamps[fpath] = mtime
-
- print("compiling {0}".format(fpath))
-
- css_path = os.path.join(path, "public", "css", fname.rsplit(".", 1)[0] + ".css")
- os.system("lessc {0} > {1}".format(fpath, css_path))
+def html_to_js_template(path, content):
+ """returns HTML template content as Javascript code, adding it to `frappe.templates`"""
+ return """frappe.templates["{key}"] = '{content}';\n""".format(
+ key=path.rsplit("/", 1)[-1][:-5], content=scrub_html_template(content))
diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 62488525b0..c5d2257d75 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -19,36 +19,38 @@ from frappe.exceptions import SiteNotSpecifiedError
@click.option('--db-type', default='mariadb', type=click.Choice(['mariadb', 'postgres']), help='Optional "postgres" or "mariadb". Default is "mariadb"')
@click.option('--db-host', help='Database Host')
@click.option('--db-port', type=int, help='Database Port')
-@click.option('--mariadb-root-username', default='root', help='Root username for MariaDB')
-@click.option('--mariadb-root-password', help='Root password for MariaDB')
+@click.option('--db-root-username', '--mariadb-root-username', help='Root username for MariaDB or PostgreSQL, Default is "root"')
+@click.option('--db-root-password', '--mariadb-root-password', help='Root password for MariaDB or PostgreSQL')
@click.option('--no-mariadb-socket', is_flag=True, default=False, help='Set MariaDB host to % and use TCP/IP Socket instead of using the UNIX Socket')
@click.option('--admin-password', help='Administrator password for new site', default=None)
@click.option('--verbose', is_flag=True, default=False, help='Verbose')
@click.option('--force', help='Force restore if site/database already exists', is_flag=True, default=False)
@click.option('--source_sql', help='Initiate database with a SQL file')
@click.option('--install-app', multiple=True, help='Install app after installation')
-def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin_password=None,
- verbose=False, install_apps=None, source_sql=None, force=None, no_mariadb_socket=False,
- install_app=None, db_name=None, db_password=None, db_type=None, db_host=None, db_port=None):
+@click.option('--set-default', is_flag=True, default=False, help='Set the new site as default site')
+def new_site(site, db_root_username=None, db_root_password=None, admin_password=None,
+ verbose=False, install_apps=None, source_sql=None, force=None, no_mariadb_socket=False,
+ install_app=None, db_name=None, db_password=None, db_type=None, db_host=None, db_port=None,
+ set_default=False):
"Create a new site"
from frappe.installer import _new_site
frappe.init(site=site, new_site=True)
- _new_site(db_name, site, mariadb_root_username=mariadb_root_username,
- mariadb_root_password=mariadb_root_password, admin_password=admin_password,
- verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force,
- no_mariadb_socket=no_mariadb_socket, db_password=db_password, db_type=db_type, db_host=db_host,
- db_port=db_port, new_site=True)
+ _new_site(db_name, site, db_root_username=db_root_username,
+ db_root_password=db_root_password, admin_password=admin_password,
+ verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force,
+ no_mariadb_socket=no_mariadb_socket, db_password=db_password, db_type=db_type, db_host=db_host,
+ db_port=db_port, new_site=True)
- if len(frappe.utils.get_sites()) == 1:
+ if set_default:
use(site)
@click.command('restore')
@click.argument('sql-file-path')
-@click.option('--mariadb-root-username', default='root', help='Root username for MariaDB')
-@click.option('--mariadb-root-password', help='Root password for MariaDB')
+@click.option('--db-root-username', '--mariadb-root-username', help='Root username for MariaDB or PostgreSQL, Default is "root"')
+@click.option('--db-root-password', '--mariadb-root-password', help='Root password for MariaDB or PostgreSQL')
@click.option('--db-name', help='Database name for site in case it is a new one')
@click.option('--admin-password', help='Administrator password for new site')
@click.option('--install-app', multiple=True, help='Install app after installation')
@@ -57,7 +59,7 @@ def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin
@click.option('--force', is_flag=True, default=False, help='Ignore the validations and downgrade warnings. This action is not recommended')
@click.option('--encryption-key', help='Backup encryption key')
@pass_context
-def restore(context, sql_file_path, encryption_key=None, mariadb_root_username=None, mariadb_root_password=None,
+def restore(context, sql_file_path, encryption_key=None, db_root_username=None, db_root_password=None,
db_name=None, verbose=None, install_app=None, admin_password=None, force=None, with_public_files=None,
with_private_files=None):
"Restore site database from an sql file"
@@ -150,8 +152,8 @@ def restore(context, sql_file_path, encryption_key=None, mariadb_root_username=N
try:
- _new_site(frappe.conf.db_name, site, mariadb_root_username=mariadb_root_username,
- mariadb_root_password=mariadb_root_password, admin_password=admin_password,
+ _new_site(frappe.conf.db_name, site, db_root_username=db_root_username,
+ db_root_password=db_root_password, admin_password=admin_password,
verbose=context.verbose, install_apps=install_app, source_sql=decompressed_file_name,
force=True, db_type=frappe.conf.db_type)
@@ -290,16 +292,16 @@ def partial_restore(context, sql_file_path, verbose, encryption_key=None):
@click.command('reinstall')
@click.option('--admin-password', help='Administrator Password for reinstalled site')
-@click.option('--mariadb-root-username', help='Root username for MariaDB')
-@click.option('--mariadb-root-password', help='Root password for MariaDB')
+@click.option('--db-root-username', '--mariadb-root-username', help='Root username for MariaDB or PostgreSQL, Default is "root"')
+@click.option('--db-root-password', '--mariadb-root-password', help='Root password for MariaDB or PostgreSQL')
@click.option('--yes', is_flag=True, default=False, help='Pass --yes to skip confirmation')
@pass_context
-def reinstall(context, admin_password=None, mariadb_root_username=None, mariadb_root_password=None, yes=False):
+def reinstall(context, admin_password=None, db_root_username=None, db_root_password=None, yes=False):
"Reinstall site ie. wipe all data and start over"
site = get_site(context)
- _reinstall(site, admin_password, mariadb_root_username, mariadb_root_password, yes, verbose=context.verbose)
+ _reinstall(site, admin_password, db_root_username, db_root_password, yes, verbose=context.verbose)
-def _reinstall(site, admin_password=None, mariadb_root_username=None, mariadb_root_password=None, yes=False, verbose=False):
+def _reinstall(site, admin_password=None, db_root_username=None, db_root_password=None, yes=False, verbose=False):
from frappe.installer import _new_site
if not yes:
@@ -319,7 +321,7 @@ def _reinstall(site, admin_password=None, mariadb_root_username=None, mariadb_ro
frappe.init(site=site)
_new_site(frappe.conf.db_name, site, verbose=verbose, force=True, reinstall=True, install_apps=installed,
- mariadb_root_username=mariadb_root_username, mariadb_root_password=mariadb_root_password,
+ db_root_username=db_root_username, db_root_password=db_root_password,
admin_password=admin_password)
@click.command('install-app')
@@ -447,21 +449,17 @@ def disable_user(context, email):
@pass_context
def migrate(context, skip_failing=False, skip_search_index=False):
"Run patches, sync schema and rebuild files/translations"
- from frappe.migrate import migrate
+ from frappe.migrate import SiteMigration
for site in context.sites:
click.secho(f"Migrating {site}", fg="green")
- frappe.init(site=site)
- frappe.connect()
try:
- migrate(
- context.verbose,
+ SiteMigration(
skip_failing=skip_failing,
- skip_search_index=skip_search_index
- )
+ skip_search_index=skip_search_index,
+ ).run(site=site)
finally:
print()
- frappe.destroy()
if not context.sites:
raise SiteNotSpecifiedError
@@ -660,16 +658,16 @@ def uninstall(context, app, dry_run, yes, no_backup, force):
@click.command('drop-site')
@click.argument('site')
-@click.option('--root-login', default='root')
-@click.option('--root-password')
+@click.option('--db-root-username', '--mariadb-root-username', '--root-login', help='Root username for MariaDB or PostgreSQL, Default is "root"')
+@click.option('--db-root-password', '--mariadb-root-password', '--root-password', help='Root password for MariaDB or PostgreSQL')
@click.option('--archived-sites-path')
@click.option('--no-backup', is_flag=True, default=False)
@click.option('--force', help='Force drop-site even if an error is encountered', is_flag=True, default=False)
-def drop_site(site, root_login='root', root_password=None, archived_sites_path=None, force=False, no_backup=False):
- _drop_site(site, root_login, root_password, archived_sites_path, force, no_backup)
+def drop_site(site, db_root_username='root', db_root_password=None, archived_sites_path=None, force=False, no_backup=False):
+ _drop_site(site, db_root_username, db_root_password, archived_sites_path, force, no_backup)
-def _drop_site(site, root_login='root', root_password=None, archived_sites_path=None, force=False, no_backup=False):
+def _drop_site(site, db_root_username=None, db_root_password=None, archived_sites_path=None, force=False, no_backup=False):
"Remove site from database and filesystem"
from frappe.database import drop_user_and_database
from frappe.utils.backups import scheduled_backup
@@ -694,7 +692,7 @@ def _drop_site(site, root_login='root', root_password=None, archived_sites_path=
click.echo("\n".join(messages))
sys.exit(1)
- drop_user_and_database(frappe.conf.db_name, root_login, root_password)
+ drop_user_and_database(frappe.conf.db_name, db_root_username, db_root_password)
archived_sites_path = archived_sites_path or os.path.join(frappe.get_app_path('frappe'), '..', '..', '..', 'archived', 'sites')
diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py
index e3379a43aa..c0bb44efab 100644
--- a/frappe/commands/utils.py
+++ b/frappe/commands/utils.py
@@ -640,6 +640,7 @@ def run_tests(context, app=None, module=None, doctype=None, test=(), profile=Fal
skip_test_records=False, skip_before_tests=False, failfast=False, case=None):
with CodeCoverage(coverage, app):
+ import frappe
import frappe.test_runner
tests = test
site = get_site(context)
@@ -742,8 +743,9 @@ def run_ui_tests(context, app, headless=False, parallel=True, with_coverage=Fals
@click.option('--profile', is_flag=True, default=False)
@click.option('--noreload', "no_reload", is_flag=True, default=False)
@click.option('--nothreading', "no_threading", is_flag=True, default=False)
+@click.option('--with-coverage', is_flag=True, default=False)
@pass_context
-def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None):
+def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None, with_coverage=False):
"Start development web server"
import frappe.app
@@ -751,8 +753,12 @@ def serve(context, port=None, profile=False, no_reload=False, no_threading=False
site = None
else:
site = context.sites[0]
-
- frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.')
+ with CodeCoverage(with_coverage, 'frappe'):
+ if with_coverage:
+ # unable to track coverage with threading enabled
+ no_threading = True
+ no_reload = True
+ frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.')
@click.command('request')
diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index b907ebc0bc..f250a6a109 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -33,9 +33,16 @@ frappe.ui.form.on('DocType', {
}
}
+ const customize_form_link = "Customize Form";
if(!frappe.boot.developer_mode && !frm.doc.custom) {
// make the document read-only
frm.set_read_only();
+ frm.dashboard.add_comment(__("DocTypes can not be modified, please use {0} instead", [customize_form_link]), "blue", true);
+ } else if (frappe.boot.developer_mode) {
+ let msg = __("This site is running in developer mode. Any change made here will be updated in code.");
+ msg += "Client Scripts are executed only on the client-side (i.e. in Forms). Here are some examples to get you started
+
+
+// fetch local_tax_no on selection of customer
+// cur_frm.add_fetch(link_field, source_fieldname, target_fieldname);
+cur_frm.add_fetch("customer", "local_tax_no', 'local_tax_no');
+
+// additional validation on dates
+frappe.ui.form.on('Task', 'validate', function(frm) {
+ if (frm.doc.from_date < get_today()) {
+ msgprint('You can not select past date in From Date');
+ validated = false;
+ }
+});
+
+// make a field read-only after saving
+frappe.ui.form.on('Task', {
+ refresh: function(frm) {
+ // use the __islocal value of doc, to check if the doc is saved or not
+ frm.set_df_property('myfield', 'read_only', frm.doc.__islocal ? 0 : 1);
+ }
+});
+
+// additional permission check
+frappe.ui.form.on('Task', {
+ validate: function(frm) {
+ if(user=='user1@example.com' && frm.doc.purpose!='Material Receipt') {
+ msgprint('You are only allowed Material Receipt');
+ validated = false;
+ }
+ }
+});
+
+// calculate sales incentive
+frappe.ui.form.on('Sales Invoice', {
+ validate: function(frm) {
+ // calculate incentives for each person on the deal
+ total_incentive = 0
+ $.each(frm.doc.sales_team, function(i, d) {
+ // calculate incentive
+ var incentive_percent = 2;
+ if(frm.doc.base_grand_total > 400) incentive_percent = 4;
+ // actual incentive
+ d.incentives = flt(frm.doc.base_grand_total) * incentive_percent / 100;
+ total_incentive += flt(d.incentives)
+ });
+ frm.doc.total_incentive = total_incentive;
+ }
+})
+
+Client Scripts are executed only on the client-side (i.e. in Forms). Here are some examples to get you started
\n\n\n// fetch local_tax_no on selection of customer \n// cur_frm.add_fetch(link_field, source_fieldname, target_fieldname); \ncur_frm.add_fetch('customer', 'local_tax_no', 'local_tax_no');\n\n// additional validation on dates \nfrappe.ui.form.on('Task', 'validate', function(frm) {\n if (frm.doc.from_date < get_today()) {\n msgprint('You can not select past date in From Date');\n validated = false;\n } \n});\n\n// make a field read-only after saving \nfrappe.ui.form.on('Task', {\n refresh: function(frm) {\n // use the __islocal value of doc, to check if the doc is saved or not\n frm.set_df_property('myfield', 'read_only', frm.doc.__islocal ? 0 : 1);\n } \n});\n\n// additional permission check\nfrappe.ui.form.on('Task', {\n validate: function(frm) {\n if(user=='user1@example.com' && frm.doc.purpose!='Material Receipt') {\n msgprint('You are only allowed Material Receipt');\n validated = false;\n }\n } \n});\n\n// calculate sales incentive\nfrappe.ui.form.on('Sales Invoice', {\n validate: function(frm) {\n // calculate incentives for each person on the deal\n total_incentive = 0\n $.each(frm.doc.sales_team, function(i, d) {\n // calculate incentive\n var incentive_percent = 2;\n if(frm.doc.base_grand_total > 400) incentive_percent = 4;\n // actual incentive\n d.incentives = flt(frm.doc.base_grand_total) * incentive_percent / 100;\n total_incentive += flt(d.incentives)\n });\n frm.doc.total_incentive = total_incentive;\n } \n})\n\n+ ${__('Add / Remove Columns')} @@ -403,18 +420,18 @@ export default class GridRow { data-label='${docfield.label}' data-type='${docfield.fieldtype}'>