vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'hotfix'

Browse source
This commit is contained in:
Ameya Shenoy 2018-10-17 09:02:44 +00:00
commit 5668e7742e
No known key found for this signature in database
GPG key ID: AC016A555657D0A3
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.1.52'
__version__ = '10.1.53'
__title__ = "Frappe Framework"
local = Local()

5
frappe/public/js/legacy/client_script_helpers.js
View file

@ -436,10 +436,11 @@ _f.Frm.prototype.set_indicator_formatter = function(fieldname, get_color, get_te
frappe.meta.docfield_map[doctype][fieldname].formatter =
function(value, df, options, doc) {
if(value) {
const escaped_name = encodeURIComponent(value);
return repl('<a class="indicator %(color)s" href="#Form/%(doctype)s/%(name)s">%(label)s</a>', {
color: get_color(doc || {}),
doctype: df.options,
name: value,
name: escaped_name,
label: get_text ? get_text(doc) : value
});
} else {
@ -516,4 +517,4 @@ _f.Frm.prototype.get_sum = function(table_fieldname, fieldname) {
sum += d[fieldname];
}
return sum;
};
};