From 5d9f26eb26c9abb8f02e23ef9655eca690ff3faa Mon Sep 17 00:00:00 2001
From: Alex Dik <mail@alexdik.de>
Date: Thu, 26 Nov 2015 13:17:27 +0100
Subject: [PATCH] Add reverse view model attribute

---
 .../activity-panel/activity-panel-overview.directive.html  | 4 ++--
 .../wp-panels/activity-panel/activity-panel.controller.js  | 2 +-
 frontend/app/ui_components/filters/latest-items-filter.js  | 7 ++-----
 .../ui_components/filters/latest-items-filter-test.js      | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/frontend/app/components/wp-panels/activity-panel/activity-panel-overview.directive.html b/frontend/app/components/wp-panels/activity-panel/activity-panel-overview.directive.html
index 274c7a2a5f..806dde144e 100644
--- a/frontend/app/components/wp-panels/activity-panel/activity-panel-overview.directive.html
+++ b/frontend/app/components/wp-panels/activity-panel/activity-panel-overview.directive.html
@@ -2,14 +2,14 @@
                       activities="vm.activities"
                       autocomplete-path="{{ vm.autocompletePath }}">
   <ul class='work-package-details-activities-list'>
-    <li ng-repeat="activity in vm.activities | latestItems : vm.order === 'desc' : 3"
+    <li ng-repeat="activity in vm.activities | latestItems : vm.reverse : 3"
         class="work-package-details-activities-activity"
 
         ng-init="inf = vm.info(activity, $index)">
 
       <activity-entry work-package="vm.workPackage"
                       activity="activity"
-                      activity-no="inf.number(vm.order !== 'desc')"
+                      activity-no="inf.number(vm.reverse)"
                       is-initial="inf.isInitial"
                       autocomplete-path="vm.autocompletePath">
       </activity-entry>
diff --git a/frontend/app/components/wp-panels/activity-panel/activity-panel.controller.js b/frontend/app/components/wp-panels/activity-panel/activity-panel.controller.js
index 44ac15672b..b0ff835019 100644
--- a/frontend/app/components/wp-panels/activity-panel/activity-panel.controller.js
+++ b/frontend/app/components/wp-panels/activity-panel/activity-panel.controller.js
@@ -35,7 +35,7 @@ function ActivityPanelController($scope, wpActivity, PathHelper){
   var vm = this;
 
   vm.activities = wpActivity.activities;
-  vm.order = wpActivity.order;
+  vm.reverse = wpActivity.order === 'asc';
   vm.info = wpActivity.info;
 
   var projectId = vm.workPackage.embedded.project.props.id;
diff --git a/frontend/app/ui_components/filters/latest-items-filter.js b/frontend/app/ui_components/filters/latest-items-filter.js
index f882d13392..a32a7ba056 100644
--- a/frontend/app/ui_components/filters/latest-items-filter.js
+++ b/frontend/app/ui_components/filters/latest-items-filter.js
@@ -27,10 +27,7 @@
 //++
 
 module.exports = function() {
-  return function(items, isDescending, visible) {
-
-    // We want to enforce descending order here, and when the setting
-    // is already descending, we no longer have to do that ourselves.
-    return isDescending ? items.slice(0,visible) : items.slice(-visible).reverse();
+  return function(items, reverse, visible) {
+    return reverse ? items.slice(-visible).reverse() : items.slice(0,visible);
   };
 };
diff --git a/frontend/tests/unit/tests/ui_components/filters/latest-items-filter-test.js b/frontend/tests/unit/tests/ui_components/filters/latest-items-filter-test.js
index 7df2b88709..00f3ec69f8 100644
--- a/frontend/tests/unit/tests/ui_components/filters/latest-items-filter-test.js
+++ b/frontend/tests/unit/tests/ui_components/filters/latest-items-filter-test.js
@@ -44,11 +44,11 @@ describe('Latest items filter', function() {
     }));
 
     it('should return the first 3 items', inject(function($filter) {
-      expect($filter('latestItems')(items, false, 3)).to.eql([9,8,7]);
+      expect($filter('latestItems')(items, true, 3)).to.eql([9,8,7]);
     }));
 
     it('should return the last 3 items reversed', inject(function($filter) {
-      expect($filter('latestItems')(items, true, 3)).to.eql([1,2,3]);
+      expect($filter('latestItems')(items, false, 3)).to.eql([1,2,3]);
     }));
 
   });