From fbf8da1d3782cbfbdcdaa5af35e094c007c07d3b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 27 Sep 2017 15:31:51 +0530 Subject: [PATCH 1/2] [minor] compileall after migrate, might solve timeouts on VM (#4197) --- frappe/commands/site.py | 4 +++- frappe/model/meta.py | 5 ++++- frappe/public/css/desk.css | 3 --- frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js | 2 +- frappe/public/less/desk.less | 4 ---- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 3e96045d22..519491746d 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals, absolute_import, print_function import click -import hashlib, os, sys +import hashlib, os, sys, compileall import frappe from frappe import _ from _mysql_exceptions import ProgrammingError @@ -218,6 +218,8 @@ def migrate(context, rebuild_website=False): finally: frappe.destroy() + compileall.compile_dir('../apps', quiet=1) + @click.command('run-patch') @click.argument('module') @pass_context diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 78977f18f8..74cce521a5 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -33,7 +33,10 @@ def get_meta(doctype, cached=True): lambda: Meta(doctype)) return frappe.local.meta_cache[doctype] else: - return Meta(doctype) + return load_meta(doctype) + +def load_meta(doctype): + return Meta(doctype) def get_table_columns(doctype): return frappe.cache().hget("table_columns", doctype, diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index b2ff1bbd06..6f61d46f08 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -1138,9 +1138,6 @@ input[type="checkbox"]:checked:before { .slides-wrapper .footer .btn:not(:last-child) { margin-right: 3px; } -.slides-wrapper .footer a.btn.make-btn { - margin-right: 7px; -} .slides-wrapper .footer a.make-btn.disabled { background-color: #b1bdca; color: #fff; diff --git a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js b/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js index 01b103956a..4e759de808 100644 --- a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js +++ b/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js @@ -114,7 +114,7 @@ frappe.setup.UserProgressDialog = class UserProgressDialog { $footer.find('.text-right') .prepend($(` ${__("Mark as Done")}`)) - .prepend($(` + .append($(` ${__("Create")}`)); }, on_update: (completed, total) => { diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 14343d3332..8887cf4d4c 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -1088,10 +1088,6 @@ input[type="checkbox"] { margin-right: 3px; } - a.btn.make-btn { - margin-right: 7px; - } - a.make-btn.disabled { background-color: #b1bdca; color: #fff; From 49862ef226751ad8c437e3b89c669b7a715ff0a0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 27 Sep 2017 17:48:53 +0600 Subject: [PATCH 2/2] bumped to version 9.0.3 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index b934a9bcf3..76223210b9 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.0.2' +__version__ = '9.0.3' __title__ = "Frappe Framework" local = Local()