From 3e3e30cfa6d5be5ba779b115fe762ec9e027917c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 8 Jul 2016 18:21:33 +0530 Subject: [PATCH] [cleanups] --- frappe/__init__.py | 7 ++++--- frappe/commands/site.py | 9 ++++++++- frappe/public/css/desk.css | 5 +++++ frappe/public/css/form_grid.css | 5 ----- frappe/public/js/frappe/ui/messages.js | 5 ++++- frappe/public/js/legacy/form.js | 2 +- frappe/public/less/desk.less | 5 +++++ frappe/public/less/form_grid.less | 4 ---- frappe/utils/data.py | 5 ++++- frappe/website/doctype/web_page/web_page.json | 5 +++-- 10 files changed, 34 insertions(+), 18 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 421595dff1..9a0ef73c74 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -460,12 +460,13 @@ def clear_cache(user=None, doctype=None): frappe.sessions.clear_cache() translate.clear_cache() reset_metadata_version() - frappe.local.cache = {} + local.cache = {} + local.new_doc_templates = {} - for fn in frappe.get_hooks("clear_cache"): + for fn in get_hooks("clear_cache"): get_attr(fn)() - frappe.local.role_permissions = {} + local.role_permissions = {} def has_permission(doctype=None, ptype="read", doc=None, user=None, verbose=False, throw=False): """Raises `frappe.PermissionError` if not permitted. diff --git a/frappe/commands/site.py b/frappe/commands/site.py index d528fbd710..4ed5d1ef23 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals, absolute_import import click -import hashlib, os +import hashlib, os, sys import frappe from frappe.commands import pass_context, get_site from frappe.commands.scheduler import _is_scheduler_enabled @@ -83,6 +83,13 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas "Restore site database from an sql file" from frappe.installer import extract_sql_gzip, extract_tar_files # Extract the gzip file if user has passed *.sql.gz file instead of *.sql file + + if not os.path.exists(sql_file_path): + sql_file_path = '../' + sql_file_path + if not os.path.exists(sql_file_path): + print 'Invalid path {0}' + sql_file_path[3:] + sys.exit(1) + if sql_file_path.endswith('sql.gz'): sql_file_path = extract_sql_gzip(os.path.abspath(sql_file_path)) diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 8be8a07f03..22757905db 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -319,6 +319,11 @@ a.form-link { textarea.form-control { height: 120px; } +.form-control[disabled], +.form-control[readonly], +fieldset[disabled] .form-control { + background-color: #fafbfc; +} .link-select-row { padding: 5px; border-bottom: 1px solid #EBEFF2; diff --git a/frappe/public/css/form_grid.css b/frappe/public/css/form_grid.css index bf2f372760..67a0bb925b 100644 --- a/frappe/public/css/form_grid.css +++ b/frappe/public/css/form_grid.css @@ -108,11 +108,6 @@ .grid-body .editable-row .has-error .form-control:focus { border-color: #ff5858; } -.grid-body .editable-row .form-control[disabled], -.grid-body .editable-row .form-control[readonly], -.grid-body .editable-row fieldset[disabled] .form-control { - background-color: #fafbfc; -} .grid-body .editable-row input[data-fieldtype="Int"], .grid-body .editable-row input[data-fieldtype="Float"], .grid-body .editable-row input[data-fieldtype="Currency"] { diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index 93126d52d3..fca372a06e 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -93,7 +93,10 @@ frappe.msgprint = function(msg, title) { } if(data.message instanceof Array) { - data.message = $.map(data.message, function(m) { return '

' + m + '

'}).join(''); + data.message.forEach(function(m) { + frappe.msgprint(m); + }); + return; } if(data.alert) { diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js index 73c4204c2f..7585372e0d 100644 --- a/frappe/public/js/legacy/form.js +++ b/frappe/public/js/legacy/form.js @@ -365,7 +365,7 @@ _f.Frm.prototype.show_web_link = function() { if(!doc.__islocal && doc.__onload && doc.__onload.is_website_generator) { me.web_link && me.web_link.remove(); if(doc.__onload.published) { - me.add_web_link("/" + doc.__onload.website_route) + me.add_web_link("/" + doc.route) } } } diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 775e694507..7b4ea58d1a 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -121,6 +121,11 @@ textarea.form-control { height: 120px; } +.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { + background-color: @light-bg; +} + + .link-select-row { padding: 5px; border-bottom: 1px solid @light-border-color; diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less index 2f398b15a8..aa724a3047 100644 --- a/frappe/public/less/form_grid.less +++ b/frappe/public/less/form_grid.less @@ -134,10 +134,6 @@ } } - .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { - background-color: @light-bg; - } - input[data-fieldtype="Int"], input[data-fieldtype="Float"], input[data-fieldtype="Currency"] { text-align: right; } diff --git a/frappe/utils/data.py b/frappe/utils/data.py index aec115210a..742e7e9b48 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -176,7 +176,10 @@ def get_time(time_str): return time_str.time() elif isinstance(time_str, datetime.time): return time_str - return parser.parse(time_str).time() + else: + if isinstance(time_str, datetime.timedelta): + time_str = str(time_str) + return parser.parse(time_str).time() def get_datetime_str(datetime_obj): if isinstance(datetime_obj, basestring): diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json index 8b74532f60..de3b2e40db 100644 --- a/frappe/website/doctype/web_page/web_page.json +++ b/frappe/website/doctype/web_page/web_page.json @@ -9,6 +9,7 @@ "docstatus": 0, "doctype": "DocType", "document_type": "Document", + "editable_grid": 0, "fields": [ { "allow_on_submit": 0, @@ -158,7 +159,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "unique": 0 + "unique": 1 }, { "allow_on_submit": 0, @@ -617,7 +618,7 @@ "issingle": 0, "istable": 0, "max_attachments": 20, - "modified": "2016-06-23 12:29:31.442059", + "modified": "2016-07-08 06:22:38.925289", "modified_by": "Administrator", "module": "Website", "name": "Web Page",