vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into develop

Browse source
This commit is contained in:
mbauskar 2017-10-10 12:35:42 +05:30
commit ae6fa0b10f
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -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()

1
frappe/public/js/frappe/form/grid.js
View file

@ -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) {

6
frappe/public/js/frappe/upload.js
View file

@ -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;
}