Merge branch 'hotfix'

This commit is contained in:
Nabin Hait 2017-09-27 17:18:53 +05:30
commit 3280f6f376
6 changed files with 9 additions and 11 deletions

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.0.2'
__version__ = '9.0.3'
__title__ = "Frappe Framework"
local = Local()

View file

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

View file

@ -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,

View file

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

View file

@ -114,7 +114,7 @@ frappe.setup.UserProgressDialog = class UserProgressDialog {
$footer.find('.text-right')
.prepend($(`<a class="done-btn btn btn-default btn-sm">
${__("Mark as Done")}</a>`))
.prepend($(`<a class="make-btn btn btn-primary btn-sm primary action">
.append($(`<a class="make-btn btn btn-primary btn-sm primary action">
${__("Create")}</a>`));
},
on_update: (completed, total) => {

View file

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