Merge pull request #8656 from gavindsouza/id-name

fix: added title_field to filters, removed search icon
This commit is contained in:
Shivam Mishra 2019-11-04 14:02:29 +05:30 committed by GitHub
commit de00a651cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -590,7 +590,7 @@ class FilterArea {
let fields = [
{
fieldtype: 'Data',
label: 'ID',
label: 'Name',
condition: 'like',
fieldname: 'name',
onchange: () => this.refresh_list_view()
@ -606,9 +606,10 @@ class FilterArea {
}
const doctype_fields = this.list_view.meta.fields;
const title_field = this.list_view.meta.title_field;
fields = fields.concat(doctype_fields.filter(
df => df.in_standard_filter &&
frappe.model.is_value_type(df.fieldtype)
df => (df.fieldname === title_field) || (df.in_standard_filter && frappe.model.is_value_type(df.fieldtype))
).map(df => {
let options = df.options;
let condition = '=';
@ -641,21 +642,6 @@ class FilterArea {
}));
fields.map(df => this.list_view.page.add_field(df));
// search icon in name filter
$('<span class="octicon octicon-search text-muted small"></span>')
.appendTo(this.list_view.page.fields_dict.name.$wrapper)
.css({
'position': 'absolute',
'z-index': '1',
'right': '7px',
'top': '9px',
'font-size': '90%'
});
this.list_view.page.fields_dict.name.$wrapper
.find('.form-control')
.css('padding-right', '2em');
}
get_standard_filters() {