diff --git a/src/calendar/calendar-scheduler.xml b/src/calendar/calendar-scheduler.xml index d12b1c3..dc6cca1 100644 --- a/src/calendar/calendar-scheduler.xml +++ b/src/calendar/calendar-scheduler.xml @@ -425,6 +425,23 @@ Scheduler The association from the resource to the event + + Resource Order + Scheduler + Order of the resource + + + + + + Resource Order Type + Scheduler + + + ASC + DESC + + Resource Label Title Scheduler diff --git a/src/calendar/widget/calendar.js b/src/calendar/widget/calendar.js index ab9c14e..bb8a9cd 100644 --- a/src/calendar/widget/calendar.js +++ b/src/calendar/widget/calendar.js @@ -122,6 +122,9 @@ define([ logger.debug(this.id + "._getResources"); mx.data.get({ xpath: "//" + this.resourceEntity, + filter: { + sort: this.resourceOrder !== "" ? [[this.resourceOrder, this.orderType]] : null + }, callback: lang.hitch(this, function(objs) { logger.debug(this.id + "._getResources callback:", objs ? objs.length + " objects" : "null"); if (callback) {