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

[fix] merge-conflict

Browse source
This commit is contained in:
Saurabh 2017-07-03 18:37:59 +05:30
commit 0d5d786a3c
3 changed files with 32 additions and 29 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
__version__ = '8.2.4'
__version__ = '8.2.5'
__title__ = "Frappe Framework"
local = Local()

51
frappe/public/js/frappe/ui/base_list.js
View file

@ -184,32 +184,35 @@ frappe.ui.BaseList = Class.extend({
return;
}
this.page.add_field({
fieldtype:'Link',
options:this.doctype,
label:'ID',
fieldname:'name',
onchange: () => { me.refresh(true); }
});
if(this.meta) {
this.page.add_field({
fieldtype:'Link',
options:this.doctype,
label:'ID',
fieldname:'name',
onchange: () => { me.refresh(true); }
});
this.meta.fields.forEach(function(df) {
if(df.in_standard_filter && !frappe.model.no_value_type.includes(df.fieldtype)) {
if(df.fieldtype == "Select" && df.options) {
var options = df.options.split("\n")
if(options.length > 0 && options[0] != ""){
options.unshift("");
df.options = options.join("\n");
this.meta.fields.forEach(function(df) {
if(df.in_standard_filter && !frappe.model.no_value_type.includes(df.fieldtype)) {
let options = df.options;
if(df.fieldtype == "Select" && df.options) {
options = df.options.split("\n")
if(options.length > 0 && options[0] != ""){
options.unshift("");
df.options = options.join("\n");
}
}
me.page.add_field({
fieldtype: df.fieldtype,
label: __(df.label),
options: df.options,
fieldname: df.fieldname,
onchange: () => {me.refresh(true);}
});
}
me.page.add_field({
fieldtype: df.fieldtype,
label: __(df.label),
options: options,
fieldname: df.fieldname,
onchange: () => { me.refresh(true); }
});
}
});
});
}
this.standard_filters_added = true;
},
@ -502,4 +505,4 @@ frappe.ui.BaseList = Class.extend({
}
});
}
});
});

8
frappe/public/js/frappe/views/communication.js
View file

@ -156,8 +156,9 @@ frappe.views.CommunicationComposer = Class.extend({
setup_standard_reply: function() {
var me = this;
this.dialog.get_input("standard_reply").on("change", function() {
var standard_reply = $(this).val();
this.dialog.fields_dict["standard_reply"].df.onchange = () => {
var standard_reply = me.dialog.fields_dict.standard_reply.$input.val();
var prepend_reply = function(reply) {
if(me.reply_added===standard_reply) {
@ -194,8 +195,7 @@ frappe.views.CommunicationComposer = Class.extend({
prepend_reply(r.message);
}
});
});
}
},
setup_last_edited_communication: function() {