Merge branch 'develop'

This commit is contained in:
Rushabh Mehta 2015-12-23 16:43:55 +05:30
commit abd4cc77a4
4 changed files with 15 additions and 3 deletions

View file

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = "6.15.3"
__version__ = "6.15.4"

View file

@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
app_icon = "octicon octicon-circuit-board"
app_version = "6.15.3"
app_version = "6.15.4"
app_color = "orange"
source_link = "https://github.com/frappe/frappe"
app_license = "MIT"

View file

@ -43,15 +43,27 @@ frappe.socket = {
});
$(document).on("form_refresh", function(e, frm) {
if (frm.is_new()) {
return;
}
frappe.socket.doc_open(frm.doctype, frm.docname);
});
$(document).on('form-unload', function(e, frm) {
if (frm.is_new()) {
return;
}
// frappe.socket.doc_unsubscribe(frm.doctype, frm.docname);
frappe.socket.doc_close(frm.doctype, frm.docname);
});
window.onbeforeunload = function() {
if (frm.is_new()) {
return;
}
// if tab/window is closed, notify other users
if (cur_frm && cur_frm.doc) {
frappe.socket.doc_close(cur_frm.doctype, cur_frm.docname);

View file

@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
version = "6.15.3"
version = "6.15.4"
requirements = parse_requirements("requirements.txt", session="")
setup(