From 04ad313eab47bd774b41160d234198534297fa52 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 13 Dec 2016 13:00:08 +0530 Subject: [PATCH 1/2] Remove web forms on uninstalling app (#2446) --- frappe/installer.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index c9be853dd3..3a3237ea25 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -184,7 +184,6 @@ def remove_app(app_name, dry_run=False, yes=False): for doctype in frappe.get_list("DocType", filters={"module": module_name}, fields=["name", "issingle"]): print "removing DocType {0}...".format(doctype.name) - # drop table if not dry_run: frappe.delete_doc("DocType", doctype.name) @@ -192,21 +191,14 @@ def remove_app(app_name, dry_run=False, yes=False): if not doctype.issingle: drop_doctypes.append(doctype.name) - # remove reports - for report in frappe.get_list("Report", filters={"module": module_name}): - print "removing {0}...".format(report.name) - if not dry_run: - frappe.delete_doc("Report", report.name) - - for page in frappe.get_list("Page", filters={"module": module_name}): - print "removing Page {0}...".format(page.name) - # drop table - - if not dry_run: - frappe.delete_doc("Page", page.name) + # remove reports, pages and web forms + for doctype in ("Report", "Page", "Web Form"): + for record in frappe.get_list(doctype, filters={"module": module_name}): + print "removing {0} {1}...".format(doctype, record.name) + if not dry_run: + frappe.delete_doc(doctype, record.name) print "removing Module {0}...".format(module_name) - if not dry_run: frappe.delete_doc("Module Def", module_name) From 29025bf917b0cc0aa01be2f510c154425f55de34 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 13 Dec 2016 14:51:18 +0600 Subject: [PATCH 2/2] bumped to version 7.1.25 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 3e796f8929..974475d7ca 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '7.1.24' +__version__ = '7.1.25' __title__ = "Frappe Framework" local = Local()