Add 'sort' key available to message conferences and areas

This commit is contained in:
Bryan Ashby 2016-03-24 23:10:08 -06:00
parent d593b097f0
commit 0b23f0aa3b

View file

@ -60,7 +60,9 @@ function getSortedAvailMessageConferences(client, options) {
}); });
sorted.sort((a, b) => { sorted.sort((a, b) => {
return a.conf.name.localeCompare(b.conf.name); const keyA = a.conf.sort ? a.conf.sort.toString() : a.conf.name;
const keyB = b.conf.sort ? b.conf.sort.toString() : b.conf.name;
return keyA.localeCompare(keyB);
}); });
return sorted; return sorted;
@ -89,15 +91,20 @@ function getAvailableMessageAreasByConfTag(confTag, options) {
} }
function getSortedAvailMessageAreasByConfTag(confTag, options) { function getSortedAvailMessageAreasByConfTag(confTag, options) {
const areas = getAvailableMessageAreasByConfTag(confTag, options); const areas = _.map(getAvailableMessageAreasByConfTag(confTag, options), (v, k) => {
return {
// :TODO: should probably be using localeCompare / sort areaTag : k,
return _.sortBy(_.map(areas, (v, k) => { area : v,
return { }
areaTag : k, });
area : v,
}; areas.sort((a, b) => {
}), o => o.area.name); // sort by name const keyA = a.area.sort ? a.area.sort.toString() : a.area.name;
const keyB = b.area.sort ? b.area.sort.toString() : b.area.name;
return keyA.localeCompare(keyB);
});
return areas;
} }
function getDefaultMessageConferenceTag(client, disableAcsCheck) { function getDefaultMessageConferenceTag(client, disableAcsCheck) {