From 2eccba06982596a575fbebec053592d364b59022 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Wed, 10 Feb 2016 18:50:11 +0100
Subject: [PATCH] Web interface: show warning when trying to register already
 registered username

---
 spectrum_manager/src/html/js/app.js            | 16 ++++++++++------
 spectrum_manager/src/html/users/register.shtml |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/spectrum_manager/src/html/js/app.js b/spectrum_manager/src/html/js/app.js
index 4cf16aa9..f1c08ff1 100644
--- a/spectrum_manager/src/html/js/app.js
+++ b/spectrum_manager/src/html/js/app.js
@@ -197,20 +197,24 @@ function fill_instances_register_form() {
 function fill_users_register_form() {
 	$(".button").click(function(e) {
 		e.preventDefault();
-		$(this).parent().empty().progressbar( {value: false} ).css('height', '1em');
 
 		var postdata ={
 			"username": $("#username").val(),
 			"password": $("#password").val()
 		};
 
-		$.post($.cookie("base_location") + "api/v1/users/add", postdata, function(data) {
-			var query = getQueryParams(document.location.search);
-			if (query.back_to_list == "1") {
-				window.location.replace("list.shtml");
+		$.post("/api/v1/users/add", postdata, function(data) {
+			if (data.error) {
+				$('#error').text(data.message);
 			}
 			else {
-				window.location.replace("../login/");
+				var query = getQueryParams(document.location.search);
+				if (query.back_to_list == "1") {
+					window.location.replace("list.shtml");
+				}
+				else {
+					window.location.replace("../login/");
+				}
 			}
 		});
 	})
diff --git a/spectrum_manager/src/html/users/register.shtml b/spectrum_manager/src/html/users/register.shtml
index 91b02a86..f4df1d69 100644
--- a/spectrum_manager/src/html/users/register.shtml
+++ b/spectrum_manager/src/html/users/register.shtml
@@ -1,7 +1,7 @@
 <!--#include virtual="/header.shtml" -->
 
 <h2>Register new Spectrum 2 manager account</h2>
-
+<div id="error" style="text-align:center;color:red;"></div>
 <form action="/api/v1/users/add" class="basic-grey" method="POST"> 
 	<h1>Register user 
 		<span>Register new user to Spectrum 2 manager web interface.</span> 
@@ -13,7 +13,7 @@
 	<label><span>Password:</span> 
 		<input type="password" id="password" name="password" placeholder="Password"></textarea> 
 	</label> 
-	<label> 
+	<label id="submitbutton">
 		<span>&nbsp;</span> 
 		<input type="submit" class="button" value="Add user" />
 	</label>