Ver código fonte

Merge branch 'develop' of github.com:webnotes/wnframework into hotfix

version-14
Akhilesh Darjee 11 anos atrás
pai
commit
d0bd7b8766
5 arquivos alterados com 14 adições e 6 exclusões
  1. +1
    -1
      config.json
  2. +8
    -0
      public/css/font-awesome.css
  3. +1
    -2
      webnotes/model/doc.py
  4. +1
    -1
      webnotes/widgets/query_report.py
  5. +3
    -2
      website/js/website.js

+ 1
- 1
config.json Ver arquivo

@@ -1,6 +1,6 @@
{
"base_template": "lib/website/templates/base.html",
"framework_version": "3.7.4",
"framework_version": "3.8.0",
"modules": {
"Calendar": {
"color": "#2980b9",


+ 8
- 0
public/css/font-awesome.css Ver arquivo

@@ -32,6 +32,14 @@
font-weight: 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
* -------------------------- */
[class^="icon-"],


+ 1
- 2
webnotes/model/doc.py Ver arquivo

@@ -348,8 +348,7 @@ class Document:
self.fields[f] = self._validate_link(link_list, 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



+ 1
- 1
webnotes/widgets/query_report.py Ver arquivo

@@ -52,7 +52,7 @@ def get_script(report_name):
return script

@webnotes.whitelist()
def run(report_name, filters=None):
def run(report_name, filters=()):
from webnotes.plugins import get_code_and_execute
report = webnotes.doc("Report", report_name)


+ 3
- 2
website/js/website.js Ver arquivo

@@ -274,9 +274,10 @@ function is_html(txt) {
}

function ask_to_login() {
if(!full_name) {
if(!window.full_name) {
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";
}


Carregando…
Cancelar
Salvar