Browse Source

Merge branch 'hotfix'

version-14
Saurabh 7 years ago
parent
commit
6de716847e
4 changed files with 8 additions and 11 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +7
    -5
      frappe/core/doctype/domain/domain.py
  3. +0
    -1
      frappe/core/doctype/domain_settings/domain_settings.py
  4. +0
    -4
      frappe/public/js/frappe/views/reports/query_report.js

+ 1
- 1
frappe/__init__.py View File

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template 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" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 7
- 5
frappe/core/doctype/domain/domain.py View File

@@ -34,11 +34,13 @@ class Domain(Document):
def remove_domain(self): def remove_domain(self):
'''Unset domain settings''' '''Unset domain settings'''
self.setup_data() 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: if self.data.custom_fields:
for doctype in self.data.custom_fields: for doctype in self.data.custom_fields:


+ 0
- 1
frappe/core/doctype/domain_settings/domain_settings.py View File

@@ -32,7 +32,6 @@ class DomainSettings(Document):
frappe.set_value('Role', role, 'disabled', 1) frappe.set_value('Role', role, 'disabled', 1)


for domain in all_domains: for domain in all_domains:
domain = _(domain)
data = frappe.get_domain_data(domain) data = frappe.get_domain_data(domain)
if not frappe.db.get_value('Domain', domain): if not frappe.db.get_value('Domain', domain):
frappe.get_doc(dict(doctype='Domain', domain=domain)).insert() frappe.get_doc(dict(doctype='Domain', domain=domain)).insert()


+ 0
- 4
frappe/public/js/frappe/views/reports/query_report.js View File

@@ -328,10 +328,6 @@ frappe.views.QueryReport = Class.extend({
me.trigger_refresh(); 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;
} }
}); });




Loading…
Cancel
Save