From 1b87a7437a75afc1371a01cda44b5eb9565e10a3 Mon Sep 17 00:00:00 2001 From: Nils Kenneweg Date: Thu, 24 Oct 2013 16:54:11 +0200 Subject: [PATCH] allow loading of pes by id. --- app/assets/javascripts/timelines.js | 2 +- app/controllers/api/v2/planning_elements_controller.rb | 4 +++- doc/CHANGELOG.md | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/timelines.js b/app/assets/javascripts/timelines.js index 00d2ba573e..86b5d5aa42 100644 --- a/app/assets/javascripts/timelines.js +++ b/app/assets/javascripts/timelines.js @@ -4971,7 +4971,7 @@ Timeline = { // construct tooltip content information. info += ""; - info += this.escape(renderable.name); + info += this.escape(renderable.subject); info += ""; if (renderable.is(Timeline.PlanningElement)) { info += " (*" + renderable.id + ")"; diff --git a/app/controllers/api/v2/planning_elements_controller.rb b/app/controllers/api/v2/planning_elements_controller.rb index 5be76244bc..d910018da0 100644 --- a/app/controllers/api/v2/planning_elements_controller.rb +++ b/app/controllers/api/v2/planning_elements_controller.rb @@ -119,7 +119,9 @@ module Api # Filters def find_all_projects_by_project_id - if params[:project_id] !~ /,/ + if !params[:project_id] then + @planning_elements = WorkPackage.find_all_by_id(params[:ids]) + elsif params[:project_id] !~ /,/ find_project_by_project_id unless performed? authorize unless performed? assign_planning_elements(@project) unless performed? diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index b3dfca2b98..d02ab05f52 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -38,6 +38,7 @@ See doc/COPYRIGHT.rdoc for more details. * `#2371` Add support for IE10 to Timelines * `#2448` Accelerate work package updates * `#2464` No initial attachment journal for messages +* `#2470` [Timelines] Vertical planning elements which are not displayed horizontally are not shown in timeline report * `#2479` Remove TinyMCE spike * `#2557` Highlight changes of any work package attribute available in the timelines table * `#2559` Migrate existing IssueCustomFields to WorkPackageCustomFields