@@ -1,6 +1,6 @@ | |||||
{ | { | ||||
"base_template": "lib/website/templates/base.html", | "base_template": "lib/website/templates/base.html", | ||||
"framework_version": "3.7.4", | |||||
"framework_version": "3.8.0", | |||||
"modules": { | "modules": { | ||||
"Calendar": { | "Calendar": { | ||||
"color": "#2980b9", | "color": "#2980b9", | ||||
@@ -32,6 +32,14 @@ | |||||
font-weight: normal; | font-weight: normal; | ||||
font-style: normal; | font-style: normal; | ||||
} | } | ||||
@media screen and (-webkit-min-device-pixel-ratio:0) { | |||||
@font-face { | |||||
font-family: 'FontAwesome'; | |||||
src: url('../lib/css/font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); | |||||
} | |||||
} | |||||
/* FONT AWESOME CORE | /* FONT AWESOME CORE | ||||
* -------------------------- */ | * -------------------------- */ | ||||
[class^="icon-"], | [class^="icon-"], | ||||
@@ -348,8 +348,7 @@ class Document: | |||||
self.fields[f] = self._validate_link(link_list, f) | self.fields[f] = self._validate_link(link_list, f) | ||||
if old_val and not self.fields[f]: | if old_val and not self.fields[f]: | ||||
s = link_list[f][1] + ': ' + old_val | |||||
err_list.append(s) | |||||
err_list.append("{}: {}".format(link_list[f][1], old_val)) | |||||
return err_list | return err_list | ||||
@@ -52,7 +52,7 @@ def get_script(report_name): | |||||
return script | return script | ||||
@webnotes.whitelist() | @webnotes.whitelist() | ||||
def run(report_name, filters=None): | |||||
def run(report_name, filters=()): | |||||
from webnotes.plugins import get_code_and_execute | from webnotes.plugins import get_code_and_execute | ||||
report = webnotes.doc("Report", report_name) | report = webnotes.doc("Report", report_name) | ||||
@@ -274,9 +274,10 @@ function is_html(txt) { | |||||
} | } | ||||
function ask_to_login() { | function ask_to_login() { | ||||
if(!full_name) { | |||||
if(!window.full_name) { | |||||
if(localStorage) { | if(localStorage) { | ||||
localStorage.setItem("last_visited", window.location.href.split("/").slice(-1)[0]); | |||||
localStorage.setItem("last_visited", | |||||
window.location.href.replace(window.location.origin, "")); | |||||
} | } | ||||
window.location.href = "login"; | window.location.href = "login"; | ||||
} | } | ||||