From f362f8423868a889d8a52fb9bd596d54e9c32f93 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Tue, 10 Oct 2017 12:29:43 +0530
Subject: [PATCH 1/2] [fix] missing dataurl in on_attach

---
 frappe/public/js/frappe/form/grid.js | 1 +
 frappe/public/js/frappe/upload.js    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 93fdabdb27..63162692cc 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -561,6 +561,7 @@ frappe.ui.form.Grid = Class.extend({
 			me.setup_download();
 
 			// upload
+			frappe.flags.no_socketio = true;
 			$(this.wrapper).find(".grid-upload").removeClass("hide").on("click", function() {
 				frappe.prompt({fieldtype:"Attach", label:"Upload File"},
 					function(data) {
diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index f8face91fb..4a8cb0c7c0 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -239,12 +239,12 @@ frappe.upload = {
 		}
 	},
 
-	_upload_file: function(fileobj, args, opts) {
+	_upload_file: function(fileobj, args, opts, dataurl) {
 		if (args.file_size) {
 			frappe.upload.validate_max_file_size(args.file_size);
 		}
 		if(opts.on_attach) {
-			opts.on_attach(args)
+			opts.on_attach(args, dataurl)
 		} else {
 			if (opts.confirm_is_private) {
 				frappe.prompt({
@@ -291,7 +291,7 @@ frappe.upload = {
 			freader.readAsDataURL(fileobj);
 		}
 
-		if (opts.no_socketio) {
+		if (opts.no_socketio || frappe.flags.no_socketio) {
 			upload_with_filedata();
 			return;
 		}

From 57f6a3918043aefec648ca663837031267e95fd1 Mon Sep 17 00:00:00 2001
From: mbauskar <mbauskar@gmail.com>
Date: Tue, 10 Oct 2017 13:05:42 +0600
Subject: [PATCH 2/2] bumped to version 9.1.5

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index fde8f720ab..8ba0dc0f61 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.1.4'
+__version__ = '9.1.5'
 __title__ = "Frappe Framework"
 
 local = Local()