Merge branch 'hotfix'

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.2.8'
+__version__ = '7.2.9'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/desk/treeview.py

@@ -46,17 +46,24 @@ def get_children():
 
 @frappe.whitelist()
 def add_node():
-	doctype = frappe.form_dict.get('doctype')
-	parent_field = 'parent_' + doctype.lower().replace(' ', '_')
-	name_field = doctype.lower().replace(' ', '_') + '_name'
+	args = make_tree_args(**frappe.form_dict)
+	doc = frappe.get_doc(args)
 
-	doc = frappe.new_doc(doctype)
-	doc.update({
-		name_field: frappe.form_dict[name_field],
-		parent_field: frappe.form_dict['parent'],
-		"is_group": frappe.form_dict['is_group']
-	})
-	if doctype == "Sales Person":
+	if args.doctype == "Sales Person":
 		doc.employee = frappe.form_dict.get('employee')
 
-	doc.save()
+	doc.save()
+
+def make_tree_args(**kwarg):
+	del kwarg['cmd']
+	
+	doctype = kwarg['doctype']
+	parent_field = 'parent_' + doctype.lower().replace(' ', '_')
+	name_field = doctype.lower().replace(' ', '_') + '_name'
+	
+	kwarg.update({
+		name_field: kwarg[name_field],
+		parent_field: kwarg["parent"]
+	})
+	
+	return frappe._dict(kwarg)

frappe/integrations/doctype/dropbox_settings/dropbox_settings.py

@@ -131,6 +131,7 @@ def get_dropbox_authorize_url():
 @frappe.whitelist(allow_guest=True)
 def dropbox_callback(oauth_token=None, not_approved=False):
 	doc = frappe.get_doc("Dropbox Settings")
+	close = '<p class="text-muted">' + _('Please close this window') + '</p>'
 
 	if not not_approved:
 		if doc.get_password(fieldname="dropbox_access_key", raise_exception=False)==oauth_token:
@@ -145,7 +146,6 @@ def dropbox_callback(oauth_token=None, not_approved=False):
 
 			frappe.db.commit()
 		else:
-			close = '<p class="text-muted">' + _('Please close this window') + '</p>'
 			frappe.respond_as_web_page(_("Dropbox Setup"),
 				_("Illegal Access Token. Please try again") + close,
 				success=False, http_status_code=frappe.AuthenticationError.http_status_code)

frappe/patches/v7_2/set_in_standard_filter_property.py

@@ -2,11 +2,14 @@ import frappe
 
 def execute():
 	frappe.reload_doc('custom', 'doctype', 'custom_field', force=True)
-	
+
 	try:
 		frappe.db.sql('update `tabCustom Field` set in_standard_filter = in_filter_dash')
 	except Exception, e:
 		if e.args[0]!=1054: raise e
-	
-	for doctype in frappe.get_all("DocType", {"istable": 0, "issingle": 0}):
-		frappe.reload_doctype(doctype.name, force=True)
+
+	for doctype in frappe.get_all("DocType", {"istable": 0, "issingle": 0, "custom": 0}):
+		try:
+			frappe.reload_doctype(doctype.name, force=True)
+		except KeyError:
+			pass

frappe/public/js/frappe/list/doclistview.js

@@ -663,7 +663,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
 			})
 
 			if(docname.length >= 1){
-				me.dialog = new frappe.ui.AssignToDialog({
+				me.dialog = new frappe.ui.form.AssignToDialog({
 					obj: me,
 					method: 'frappe.desk.form.assign_to.add_multiple',
 					doctype: me.doctype,

frappe/public/js/frappe/views/treeview.js

@@ -214,7 +214,6 @@ frappe.views.TreeView = Class.extend({
 			}
 
 			$.extend(args, v)
-
 			return frappe.call({
 				method: me.opts.add_tree_node || "frappe.desk.treeview.add_node",
 				args: args,