From b1c754b1e69de8c93230238cdc20cd02016ae026 Mon Sep 17 00:00:00 2001
From: Tim Habermaas <tim.habermaas@gmail.com>
Date: Wed, 26 Aug 2015 15:20:47 +0200
Subject: [PATCH] Make creating work packages from show view work.

---
 .../work_packages/menus/tasks_dropdown_menu.html      |  2 +-
 frontend/app/work_packages/controllers/index.js       |  1 +
 .../controllers/work-package-show-controller.js       | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/app/templates/work_packages/menus/tasks_dropdown_menu.html b/frontend/app/templates/work_packages/menus/tasks_dropdown_menu.html
index 022c0c40f1..cce6e693ec 100644
--- a/frontend/app/templates/work_packages/menus/tasks_dropdown_menu.html
+++ b/frontend/app/templates/work_packages/menus/tasks_dropdown_menu.html
@@ -1,7 +1,7 @@
 <div class="dropdown action-menu dropdown-relative dropdown-anchor-right" id="tasksDropdown" role="menu">
   <ul class="dropdown-menu">
     <li ng-repeat="type in availableTypes">
-      <a role="menuitem" focus="{{ !$index }}" ui-sref="work-packages.list.new({type: type.id})">
+      <a role="menuitem" focus="{{ !$index }}" ui-sref="work-packages.list.new({projectPath: PathHelper.staticBase + '/projects/' + projectIdentifier, type: type.id})">
         {{type.name}}
       </a>
     </li>
diff --git a/frontend/app/work_packages/controllers/index.js b/frontend/app/work_packages/controllers/index.js
index 493b0044cf..de4573f75b 100644
--- a/frontend/app/work_packages/controllers/index.js
+++ b/frontend/app/work_packages/controllers/index.js
@@ -124,6 +124,7 @@ angular.module('openproject.workPackages.controllers')
     'UsersHelper',
     'ConfigurationService',
     'WorkPackageService',
+    'ProjectService',
     'CommonRelationsHandler',
     'ChildrenRelationsHandler',
     'ParentRelationsHandler',
diff --git a/frontend/app/work_packages/controllers/work-package-show-controller.js b/frontend/app/work_packages/controllers/work-package-show-controller.js
index 8be3a30487..2dc50db83a 100644
--- a/frontend/app/work_packages/controllers/work-package-show-controller.js
+++ b/frontend/app/work_packages/controllers/work-package-show-controller.js
@@ -40,6 +40,7 @@ module.exports = function($scope,
     UsersHelper,
     ConfigurationService,
     WorkPackageService,
+    ProjectService,
     CommonRelationsHandler,
     ChildrenRelationsHandler,
     ParentRelationsHandler,
@@ -65,10 +66,20 @@ module.exports = function($scope,
   $scope.maxDescriptionLength = 800;
   $scope.projectIdentifier = $scope.workPackage.embedded.project.props.identifier;
 
+  function fetchProjectTypes() {
+    ProjectService.getProject($scope.projectIdentifier)
+      .then(function(project) {
+        $scope.availableTypes = project.embedded.types;
+      });
+  }
+
+  fetchProjectTypes();
+
   function refreshWorkPackage(callback) {
     WorkPackageService.getWorkPackage($scope.workPackage.props.id)
       .then(function(workPackage) {
         setWorkPackageScopeProperties(workPackage);
+        fetchProjectTypes();
         $scope.$broadcast('workPackageRefreshed');
         if (callback) {
           callback(workPackage);