Merge pull request scrollback#698 from scrollback/smallfixes

Show correct error message when room or user couldn't be created
vikrampes · May 19, 2015 · fb097c3 · fb097c3
2 parents e23329e + 99f7772
commit fb097c3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ui/utils/create-entity.js b/ui/utils/create-entity.js
@@ -16,7 +16,7 @@ module.exports = function(core, config, store) {
 		}
 
 		if (type === "room") {
-			validateEntity("Room", name, function(res) {
+			validateEntity("Room", name, function(res, msg) {
 				var room, roomObj, newRoom, identities, context,
 					nav = store.get("nav");
 
@@ -25,7 +25,7 @@ module.exports = function(core, config, store) {
 				}
 
 				if (res === "error") {
-					return callback("error", name || roomError);
+					return callback("error", msg || roomError);
 				}
 
 				if (res === "ok") {
@@ -74,15 +74,15 @@ module.exports = function(core, config, store) {
 				}
 			});
 		} else if (type === "user") {
-			validateEntity("User", name, function(res) {
+			validateEntity("User", name, function(res, msg) {
 				var userObj;
 
 				if (res === "wait") {
 					return callback("wait");
 				}
 
 				if (res === "error") {
-					return callback("error", name || userError);
+					return callback("error", msg || userError);
 				}
 
 				if (res === "ok") {