Merge pull request #637 from opf/fix/project_sorting

app/assets/javascripts/timelines.js

@@ -2042,11 +2042,17 @@ Timeline = {
       return this;
     },
     start: function() {
-      var first = this.getPlanningElements()[0];
+      var i, current, pes = this.getPlanningElements();
-      if (!first) {
+      for (i = 0; i < pes.length; i += 1) {
-        return undefined;
+        current = pes[i];
+        if (current.start()) {
+          return current.start();
+        } else if (current.end()) {
+          return current.end();
+        }
       }
-      return first.start();
+
+      return undefined;
     },
     getAttribute: function (val) {
       if (typeof this[val] === "function") {

doc/CHANGELOG.md

@@ -31,6 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 * `#313`  Fix: Changing the menu title of a menu wiki page does not work
 * `#1368` Fix: Readding project members in user admin view
+* `#1961` Sort project by time should only include work packages that are shown within the timeline report 
 * `#2653` Remove relative vertical offset corrections and custom border fixes for IE8.
 * `#2654` Remove custom font rendering/kerning as well as VML from timelines.
 * `#2655` Find a sensible default for Timelines rendering bucket size.
@@ -49,10 +50,10 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ## 3.0.0pre29
 
+* `#1748` Add option to diable browser cache
 * `#2473` [Timelines] Tooltip in timeline report shows star * instead of hash # in front of ID
-* `#2721` Fix: Fix: Fix: Missing journal entries for customizable_journals
 * `#2718` Newlines in workpackage descriptions aren't normalized for change tracking
-* `#1748` Add option to diable browser cache
+* `#2721` Fix: Fix: Fix: Missing journal entries for customizable_journals
 
 ## 3.0.0pre28
 

features/timelines/timeline_view_with_reporters.feature

@@ -105,6 +105,7 @@ Feature: Timeline View Tests with reporters
 
       And there are the following work packages:
           | Subject    | Start date | Due date   | description       | status | responsible |
+          | None       |            |            | Aioli Sali        | closed | manager     |
           | January13  | 2013-01-01 | 2013-01-31 | Aioli Grande      | closed | manager     |
           | February13 | 2013-02-01 | 2013-02-24 | Aioli Sali        | closed | manager     |
           | March13    | 2013-03-01 | 2013-03-30 | Sali Grande       | closed | manager     |
@@ -127,7 +128,8 @@ Feature: Timeline View Tests with reporters
 
       And there are the following work packages:
           | Subject   | Start date | Due date   | description  | status | responsible |
-          | July      | 2012-07-01 | 2013-07-31 | Aioli Grande | closed | manager     |
+          | None      |            |            | Aioli Sali   | closed | manager     |
+          | July      | 2013-07-01 | 2013-07-31 | Aioli Grande | closed | manager     |
           | August    | 2012-08-01 | 2013-08-31 | Aioli Sali   | closed | manager     |
           | Septembre | 2012-09-01 | 2013-09-30 | Sali Grande  | closed | manager     |
 
@@ -246,3 +248,14 @@ Feature: Timeline View Tests with reporters
       And I should see the project "ecookbook_q3"
       And I should see the project "ecookbook0"
       And the project "ecookbook13" should follow after "ecookbook"
+
+  @javascript
+  Scenario: First level grouping and sortation
+    Given I am working in the timeline "Testline" of the project called "ecookbook"
+    When there is a timeline "Testline" for project "ecookbook"
+      And I go to the page of the timeline "Testline" of the project called "ecookbook"
+      And I wait for timeline to load table
+
+     Then the project "ecookbook13" should follow after "ecookbook_q3"
+      And the project "ecookbook_q3" should follow after "ecookbook0"
+      And the project "ecookbook0" should follow after "ecookbook_empty"