fix(profile): fixed change password link and page, fixes #4542

43ebc172 · Torkel Ödegaard · 892e79a9 · 43ebc172 · 43ebc172 · 43ebc172
Commit 43ebc172 authored Apr 04, 2016 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

CHANGELOG.md
+1 -0

pkg/api/api.go
+1 -0

public/app/core/routes/routes.ts
+1 -1

public/app/features/org/all.js
+1 -0

No files found.
--- 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)

--- 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)

--- 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,
  })

--- 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',