diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index 0910bcd176..0f932f61b0 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -206,6 +206,11 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', ' 'party_date_joined': window.env.t('sortJoined'), }; + $scope.partyOrderAscendingChoices = { + 'ascending': window.env.t('ascendingSort'), + 'descending': window.env.t('descendingSort') + } + }]) .controller("GuildsCtrl", ['$scope', 'Groups', 'User', 'Challenges', '$rootScope', '$state', '$location', '$compile', diff --git a/public/js/controllers/headerCtrl.js b/public/js/controllers/headerCtrl.js index 3ac7bc90d3..b826f18141 100644 --- a/public/js/controllers/headerCtrl.js +++ b/public/js/controllers/headerCtrl.js @@ -33,7 +33,10 @@ habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User', return true; } } - ).reverse() + ) + if (User.user.party.orderAscending == "descending") { + $scope.partyMinusSelf = $scope.partyMinusSelf.reverse() + } }); } ]); diff --git a/src/models/user.js b/src/models/user.js index 2877256b14..98a18decc2 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -229,6 +229,7 @@ var UserSchema = new Schema({ party: { // id // FIXME can we use a populated doc instead of fetching party separate from user? order: {type:String, 'default':'level'}, + orderAscending: {type:String, 'default':'ascending'}, quest: { key: String, progress: { diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 78092b630a..b64c54c78d 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -59,6 +59,12 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild ng-options='k as v for (k , v) in partyOrderChoices', ng-change='set({"party.order": user.party.order})' ) + select#partyOrderAscending( + ng-model='user.party.orderAscending', + ng-controller='ChatCtrl', + ng-options='k as v for (k , v) in partyOrderAscendingChoices', + ng-change='set({"party.orderAscending": user.party.orderAscending})' + ) table.table.table-striped(bindonce='group') tr(ng-repeat='member in group.members') td