Browse Source

fixes in scrubbing url

version-14
Nabin Hait 10 years ago
parent
commit
15ab5c19fd
5 changed files with 4 additions and 7 deletions
  1. +2
    -2
      frappe/__init__.py
  2. +0
    -1
      frappe/public/css/desk.css
  3. +1
    -1
      frappe/public/less/desk.less
  4. +1
    -2
      frappe/utils/jinja.py
  5. +0
    -1
      frappe/website/render.py

+ 2
- 2
frappe/__init__.py View File

@@ -868,9 +868,9 @@ def add_version(doc):
"doclist_json": as_json(doc.as_dict()) "doclist_json": as_json(doc.as_dict())
}).insert(ignore_permissions=True) }).insert(ignore_permissions=True)


def as_json(obj):
def as_json(obj, indent=1):
from frappe.utils.response import json_handler from frappe.utils.response import json_handler
return json.dumps(obj, indent=1, sort_keys=True, default=json_handler)
return json.dumps(obj, indent=indent, sort_keys=True, default=json_handler)


def get_test_records(doctype): def get_test_records(doctype):
"""Returns list of objects from `test_records.json` in the given doctype's folder.""" """Returns list of objects from `test_records.json` in the given doctype's folder."""


+ 0
- 1
frappe/public/css/desk.css View File

@@ -254,7 +254,6 @@ a.form-link {
max-height: 200px; max-height: 200px;
background-color: #fffce7; background-color: #fffce7;
border: 1px solid #d1d8dd; border: 1px solid #d1d8dd;
word-break: break-all;
overflow-y: auto; overflow-y: auto;
position: relative; position: relative;
} }


+ 1
- 1
frappe/public/less/desk.less View File

@@ -60,7 +60,7 @@ a.form-link {
background-color: @light-yellow; background-color: @light-yellow;
border: 1px solid @border-color; border: 1px solid @border-color;


word-break: break-all;
// word-break: break-all;
overflow-y: auto; overflow-y: auto;
position: relative; position: relative;




+ 1
- 2
frappe/utils/jinja.py View File

@@ -111,11 +111,10 @@ def set_filters(jenv):
from frappe.utils import global_date_format, cint, cstr, flt from frappe.utils import global_date_format, cint, cstr, flt
from frappe.website.utils import get_shade, with_leading_slash from frappe.website.utils import get_shade, with_leading_slash
from markdown2 import markdown from markdown2 import markdown
from json import dumps


jenv.filters["global_date_format"] = global_date_format jenv.filters["global_date_format"] = global_date_format
jenv.filters["markdown"] = markdown jenv.filters["markdown"] = markdown
jenv.filters["json"] = dumps
jenv.filters["json"] = frappe.as_json
jenv.filters["get_shade"] = get_shade jenv.filters["get_shade"] = get_shade
jenv.filters["len"] = len jenv.filters["len"] = len
jenv.filters["int"] = cint jenv.filters["int"] = cint


+ 0
- 1
frappe/website/render.py View File

@@ -141,7 +141,6 @@ def build_page(path):
context = get_context(path) context = get_context(path)


html = frappe.get_template(context.base_template_path).render(context) html = frappe.get_template(context.base_template_path).render(context)
html = scrub_relative_urls(html)


if can_cache(context.no_cache): if can_cache(context.no_cache):
frappe.cache().set_value("page:{0}:{1}".format(path, frappe.local.lang), html) frappe.cache().set_value("page:{0}:{1}".format(path, frappe.local.lang), html)


Loading…
Cancel
Save