From 5558a7b22e29fb60194ba0773e9e39a9a702a6b9 Mon Sep 17 00:00:00 2001
From: Philip Norman <philip@mesosphere.io>
Date: Thu, 11 Feb 2016 14:36:36 +0100
Subject: [PATCH] Pre-fill group name in app creation modal

Fixes mesosphere/marathon#3218
---
 CHANGELOG.md                   | 1 +
 src/js/components/Marathon.jsx | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37c1ee0c6..722c4b952 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - \#3164 - Show server-side validation errors for invalid object
 - \#3214 -  App creation modal ports field default value does not reflect
   service default value
+- \#3218 - Regression: group name no longer pre-filled in app modal
 
 ## 0.15.3 - 2016-02-03
 ### Fixed
diff --git a/src/js/components/Marathon.jsx b/src/js/components/Marathon.jsx
index 40c79a695..17a4b05d1 100644
--- a/src/js/components/Marathon.jsx
+++ b/src/js/components/Marathon.jsx
@@ -61,7 +61,10 @@ var Marathon = React.createClass({
     var modal = null;
 
     if (modalQuery === "new-app") {
-      modal = this.getNewAppModal(query.groupId);
+      let groupId = params.groupId != null
+        ? decodeURIComponent(params.groupId)
+        : null;
+      modal = this.getNewAppModal(groupId);
     } else if (modalQuery === "about") {
       modal = this.getAboutModal();
     } else if (modalQuery === "help") {