From 9a641ee7c02d97382734a4b8abd5cce9b7ae7982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 26 Jan 2015 12:58:03 +0100
Subject: [PATCH] Corrected the use of POST vs PUT, POST creates something, PUT
 updates, got them mixed up

---
 grafana        |  2 +-
 pkg/api/api.go | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/grafana b/grafana
index a0c8d3fa6fd..ab7e2f89fb5 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit a0c8d3fa6fdf8eb3624af130fe12244f0e8d5e01
+Subproject commit ab7e2f89fb596d6adc9a28177feb97574e860ce7
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 22fbe5bf612..6b4c2c44e31 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -35,22 +35,22 @@ func Register(r *macaron.Macaron) {
 
 	// sign up
 	r.Get("/signup", Index)
-	r.Put("/api/user/signup", bind(m.CreateUserCommand{}), SignUp)
+	r.Post("/api/user/signup", bind(m.CreateUserCommand{}), SignUp)
 
 	// authed api
 	r.Group("/api", func() {
 		// user
 		r.Group("/user", func() {
 			r.Get("/", GetUser)
-			r.Post("/", bind(m.UpdateUserCommand{}), UpdateUser)
+			r.Put("/", bind(m.UpdateUserCommand{}), UpdateUser)
 			r.Post("/using/:id", SetUsingAccount)
 			r.Get("/accounts", GetUserAccounts)
 		})
 
 		// account
 		r.Group("/account", func() {
-			r.Put("/", bind(m.CreateAccountCommand{}), CreateAccount)
-			r.Put("/users", bind(m.AddAccountUserCommand{}), AddAccountUser)
+			r.Post("/", bind(m.CreateAccountCommand{}), CreateAccount)
+			r.Post("/users", bind(m.AddAccountUserCommand{}), AddAccountUser)
 			r.Get("/users", GetAccountUsers)
 			r.Delete("/users/:id", RemoveAccountUser)
 		})
@@ -58,8 +58,8 @@ func Register(r *macaron.Macaron) {
 		r.Group("/tokens", func() {
 			r.Combo("/").
 				Get(GetTokens).
-				Put(bind(m.AddTokenCommand{}), AddToken).
-				Post(bind(m.UpdateTokenCommand{}), UpdateToken)
+				Post(bind(m.AddTokenCommand{}), AddToken).
+				Put(bind(m.UpdateTokenCommand{}), UpdateToken)
 			r.Delete("/:id", DeleteToken)
 		})
 		// Data sources