Bläddra i källkod

[fix] route too long

version-14
Rushabh Mehta 9 år sedan
förälder
incheckning
83eee92692
3 ändrade filer med 5 tillägg och 5 borttagningar
  1. +1
    -1
      frappe/__init__.py
  2. +2
    -2
      frappe/model/base_document.py
  3. +2
    -2
      frappe/website/website_generator.py

+ 1
- 1
frappe/__init__.py Visa fil

@@ -296,7 +296,7 @@ def throw(msg, exc=ValidationError, title=None):


:param msg: Message. :param msg: Message.
:param exc: Exception class. Default `frappe.ValidationError`""" :param exc: Exception class. Default `frappe.ValidationError`"""
msgprint(msg, raise_exception=exc, title=title)
msgprint(msg, raise_exception=exc, title=title, indicator='red')


def emit_js(js, user=False, **kwargs): def emit_js(js, user=False, **kwargs):
from frappe.async import publish_realtime from frappe.async import publish_realtime


+ 2
- 2
frappe/model/base_document.py Visa fil

@@ -511,8 +511,8 @@ class BaseDocument(object):
else: else:
reference = "{0} {1}".format(_(self.doctype), self.name) reference = "{0} {1}".format(_(self.doctype), self.name)


frappe.throw(_("{0}: '{1}' will get truncated, as max characters allowed is {2}")\
.format(reference, _(df.label), max_length), frappe.CharacterLengthExceededError)
frappe.throw(_("{0}: '{1}' ({3}) will get truncated, as max characters allowed is {2}")\
.format(reference, _(df.label), max_length, value), frappe.CharacterLengthExceededError, title=_('Value too big'))


def _validate_update_after_submit(self): def _validate_update_after_submit(self):
# get the full doc with children # get the full doc with children


+ 2
- 2
frappe/website/website_generator.py Visa fil

@@ -35,7 +35,7 @@ class WebsiteGenerator(Document):
self.route = self.make_route() self.route = self.make_route()


if self.route: if self.route:
self.route = self.route.strip('/.')[:140]
self.route = self.route.strip('/.')[:139]


def make_route(self): def make_route(self):
return self.scrub(self.get(self.website.page_title_field or "name")) return self.scrub(self.get(self.website.page_title_field or "name"))
@@ -49,7 +49,7 @@ class WebsiteGenerator(Document):
clear_cache(self.route) clear_cache(self.route)


def scrub(self, text): def scrub(self, text):
return quoted(cleanup_page_name(text).replace('_', '-'))
return cleanup_page_name(text).replace('_', '-')


def get_parents(self, context): def get_parents(self, context):
'''Return breadcrumbs''' '''Return breadcrumbs'''


Laddar…
Avbryt
Spara