Bladeren bron

sorted filters alphabetically by label

version-14
Anand Doshi 12 jaren geleden
bovenliggende
commit
ded72f81e3
2 gewijzigde bestanden met toevoegingen van 24 en 5 verwijderingen
  1. +18
    -1
      public/js/wn/misc/utils.js
  2. +6
    -4
      public/js/wn/ui/filters.js

+ 18
- 1
public/js/wn/misc/utils.js Bestand weergeven

@@ -139,5 +139,22 @@ wn.utils = {
style = "info"; style = "info";
} }
return style; return style;
}
},
sort: function(list, key, compare_type, reverse) {
var sort_fn = {
"string": function(a, b) {
return cstr(a[key]).localeCompare(cstr(b[key]));
},
"number": function(a, b) {
return flt(a[key]) - flt(b[key]);
}
};
list.sort(sort_fn[compare_type]);
if(reverse) { list.reverse(); }
return list;
},
}; };

+ 6
- 4
public/js/wn/ui/filters.js Bestand weergeven

@@ -356,15 +356,17 @@ wn.ui.FieldSelect = Class.extend({
} }


// main table // main table
$.each(std_filters.concat(wn.meta.docfield_list[me.doctype]), function(i, df) {
var main_table_fields = std_filters.concat(wn.meta.docfield_list[me.doctype]);
$.each(wn.utils.sort(main_table_fields, "label", "string"), function(i, df) {
if(wn.perm.has_perm(me.doctype, df.permlevel, READ)) if(wn.perm.has_perm(me.doctype, df.permlevel, READ))
me.add_field_option(df); me.add_field_option(df);
}); });


// child tables // child tables
$.each(me.table_fields, function(i,table_df) {
$.each(me.table_fields, function(i, table_df) {
if(table_df.options) { if(table_df.options) {
$.each(wn.meta.docfield_list[table_df.options], function(i, df) {
var child_table_fields = [].concat(wn.meta.docfield_list[table_df.options]);
$.each(wn.utils.sort(child_table_fields, "label", "string"), function(i, df) {
if(wn.perm.has_perm(me.doctype, df.permlevel, READ)) if(wn.perm.has_perm(me.doctype, df.permlevel, READ))
me.add_field_option(df); me.add_field_option(df);
}); });
@@ -392,5 +394,5 @@ wn.ui.FieldSelect = Class.extend({
if(!me.fields_by_name[df.parent]) me.fields_by_name[df.parent] = {}; if(!me.fields_by_name[df.parent]) me.fields_by_name[df.parent] = {};
me.fields_by_name[df.parent][df.fieldname] = df; me.fields_by_name[df.parent][df.fieldname] = df;
} }
}
},
}) })

Laden…
Annuleren
Opslaan