diff --git a/frappe/__init__.py b/frappe/__init__.py index 443a5a612e..85961bc93a 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '9.2.14' +__version__ = '9.2.15' __title__ = "Frappe Framework" local = Local() diff --git a/frappe/core/doctype/domain/domain.py b/frappe/core/doctype/domain/domain.py index d897d6ee30..1f9ff60f66 100644 --- a/frappe/core/doctype/domain/domain.py +++ b/frappe/core/doctype/domain/domain.py @@ -34,11 +34,13 @@ class Domain(Document): def remove_domain(self): '''Unset domain settings''' self.setup_data() - for role_name in self.data.restricted_roles: - if frappe.db.exists('Role', role_name): - role = frappe.get_doc('Role', role_name) - role.disabled = 1 - role.save() + + if self.data.restricted_roles: + for role_name in self.data.restricted_roles: + if frappe.db.exists('Role', role_name): + role = frappe.get_doc('Role', role_name) + role.disabled = 1 + role.save() if self.data.custom_fields: for doctype in self.data.custom_fields: diff --git a/frappe/core/doctype/domain_settings/domain_settings.py b/frappe/core/doctype/domain_settings/domain_settings.py index a6bfaa0957..ab3cfc38df 100644 --- a/frappe/core/doctype/domain_settings/domain_settings.py +++ b/frappe/core/doctype/domain_settings/domain_settings.py @@ -32,7 +32,6 @@ class DomainSettings(Document): frappe.set_value('Role', role, 'disabled', 1) for domain in all_domains: - domain = _(domain) data = frappe.get_domain_data(domain) if not frappe.db.get_value('Domain', domain): frappe.get_doc(dict(doctype='Domain', domain=domain)).insert() diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index ab58a2af0e..1c820d9f85 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -328,10 +328,6 @@ frappe.views.QueryReport = Class.extend({ me.trigger_refresh(); } } - - // This is specifically done true earlier due to some reason. Please update if anyone finds that. - // Done false as the api can be used in the script reports which can break due to invalid links - df.ignore_link_validation = false; } });