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

fix: Sider Issues

Browse source
This commit is contained in:
Hussain Nagaria 2021-04-27 13:30:30 +05:30
parent 472b21c4b7
commit 6975e895bc
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/public/js/frappe/form/controls/data.js
View file

@ -29,14 +29,17 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({
// Only show edit link to users who can update the doctype
if (this.frm && frappe.model.can_write(this.frm.doctype)) {
let doctype_edit_link = null
let doctype_edit_link = null;
if (this.frm.meta.custom) {
doctype_edit_link = frappe.utils.get_form_link('DocType', this.frm.doctype, true,
__('this form'))
doctype_edit_link = frappe.utils.get_form_link(
'DocType',
this.frm.doctype, true,
__('this form')
);
} else {
doctype_edit_link = frappe.utils.get_form_link('Customize Form', 'Customize Form', true, null, {
doc_type: this.frm.doctype
})
});
}
let edit_note = __('{0}: You can increase the limit for the field if required via {1}', [
__('Note').bold(),

2
frappe/public/js/frappe/form/formatters.js
View file

@ -162,7 +162,7 @@ frappe.form.formatters = {
return value || "";
},
DateRange: function(value) {
if(Array.isArray(value)) {
if (Array.isArray(value)) {
return __("{0} to {1}", [frappe.datetime.str_to_user(value[0]), frappe.datetime.str_to_user(value[1])]);
} else {
return value || "";