From 607911d0a0ab9dd186a8187c3dfe454109bd69aa Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 27 Apr 2015 16:58:27 +0530 Subject: [PATCH 1/3] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b99a31a0cf..d112e05984 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: - sudo service mysql stop - sudo apt-get install python-software-properties - sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db - - sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main' + - sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu precise main' - sudo apt-get update - sudo apt-get purge -y mysql-common - sudo apt-get install mariadb-server mariadb-common libmariadbclient-dev From 9425698fe6394e400d264514940aa7aa303d8b8f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 27 Apr 2015 17:17:42 +0530 Subject: [PATCH 2/3] [fixes] added for update in document save to prevent double saving --- frappe/model/document.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index af6851cabc..1467830fa0 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -285,11 +285,13 @@ class Document(BaseDocument): if cstr(modified) and cstr(modified) != cstr(self._original_modified): conflict = True else: - tmp = frappe.db.get_value(self.doctype, self.name, - ["modified", "docstatus"], as_dict=True) + tmp = frappe.db.sql("""select modified, docstatus from `tab{0}` + where name = %s for update""".format(self.doctype), self.name, as_dict=True) if not tmp: frappe.throw(_("Record does not exist")) + else: + tmp = tmp[0] modified = cstr(tmp.modified) From 7b2efbb8688b382e85585ae9dbdd9052a8096148 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 27 Apr 2015 17:58:05 +0600 Subject: [PATCH 3/3] bumped to version 4.14.1 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 06b7f575ea..17bbea8ac4 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "4.14.0" +__version__ = "4.14.1" diff --git a/frappe/hooks.py b/frappe/hooks.py index 047cbcb6dd..39755a3aaf 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -4,7 +4,7 @@ app_title = "Frappe Framework" app_publisher = "Web Notes Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "assets/frappe/images/frappe.svg" -app_version = "4.14.0" +app_version = "4.14.1" app_color = "#3498db" app_email = "support@frappe.io" diff --git a/setup.py b/setup.py index b3c6dd7ff7..6d27595749 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.14.0" +version = "4.14.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()