From 43ebc172cb57907869fb4d261ad361286eaccfdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 4 Apr 2016 13:52:41 -0400
Subject: [PATCH] fix(profile): fixed change password link and page, fixes
 #4542

---
 CHANGELOG.md                     | 1 +
 pkg/api/api.go                   | 1 +
 public/app/core/routes/routes.ts | 2 +-
 public/app/features/org/all.js   | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e92dd13f52..cb4ab3ad1e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * **Page Load Crash**: A Datasource with null jsonData would make Grafana fail to load page, fixes [#4536](https://github.com/grafana/grafana/issues/4536)
 * **Metrics tab**: Fix for missing datasource name in datasource selector, fixes [#4540](https://github.com/grafana/grafana/issues/4540)
 * **Graph**: Fix legend in table mode with series on right-y axis, fixes [#4551](https://github.com/grafana/grafana/issues/4551), [#1145](https://github.com/grafana/grafana/issues/1145)
+* **Password**: Password reset link/page did not work, fixes [#4542](https://github.com/grafana/grafana/issues/4542)
 
 # 3.0.0-beta1 (2016-03-31)
 
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 5ae51b58904..85f1e2474c3 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -29,6 +29,7 @@ func Register(r *macaron.Macaron) {
 
 	// authed views
 	r.Get("/profile/", reqSignedIn, Index)
+	r.Get("/profile/password", reqSignedIn, Index)
 	r.Get("/org/", reqSignedIn, Index)
 	r.Get("/org/new", reqSignedIn, Index)
 	r.Get("/datasources/", reqSignedIn, Index)
diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts
index c258fb1a611..1608a772e87 100644
--- a/public/app/core/routes/routes.ts
+++ b/public/app/core/routes/routes.ts
@@ -94,7 +94,7 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
     resolve: loadOrgBundle,
   })
   .when('/profile/password', {
-    templateUrl: 'public/app/features/org/partials/password.html',
+    templateUrl: 'public/app/features/org/partials/change_password.html',
     controller : 'ChangePasswordCtrl',
     resolve: loadOrgBundle,
   })
diff --git a/public/app/features/org/all.js b/public/app/features/org/all.js
index b610a20e686..e206583a8c7 100644
--- a/public/app/features/org/all.js
+++ b/public/app/features/org/all.js
@@ -3,6 +3,7 @@ define([
   './profile_ctrl',
   './org_users_ctrl',
   './select_org_ctrl',
+  './change_password_ctrl',
   './newOrgCtrl',
   './userInviteCtrl',
   './orgApiKeysCtrl',