From 83eee926923203409206754a2c85f05c003b865c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 28 Jul 2016 11:12:42 +0530 Subject: [PATCH] [fix] route too long --- frappe/__init__.py | 2 +- frappe/model/base_document.py | 4 ++-- frappe/website/website_generator.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index e6dd2c3778..57a400bc03 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -296,7 +296,7 @@ def throw(msg, exc=ValidationError, title=None): :param msg: Message. :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): from frappe.async import publish_realtime diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 382e03fcc8..3321153181 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -511,8 +511,8 @@ class BaseDocument(object): else: 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): # get the full doc with children diff --git a/frappe/website/website_generator.py b/frappe/website/website_generator.py index 51129adada..b81acc8549 100644 --- a/frappe/website/website_generator.py +++ b/frappe/website/website_generator.py @@ -35,7 +35,7 @@ class WebsiteGenerator(Document): self.route = self.make_route() if self.route: - self.route = self.route.strip('/.')[:140] + self.route = self.route.strip('/.')[:139] def make_route(self): return self.scrub(self.get(self.website.page_title_field or "name")) @@ -49,7 +49,7 @@ class WebsiteGenerator(Document): clear_cache(self.route) def scrub(self, text): - return quoted(cleanup_page_name(text).replace('_', '-')) + return cleanup_page_name(text).replace('_', '-') def get_parents(self, context): '''Return breadcrumbs'''