From c7cc3f72f86d7c7c0fee045c24f74fc79bcdbae3 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Wed, 9 Jul 2014 13:35:59 -0400
Subject: [PATCH] - Fix error messages in new org creation - Add the org name
 regex to the name field

---
 static/js/controllers.js              | 2 +-
 static/partials/new-organization.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/controllers.js b/static/js/controllers.js
index 35086d4a3..cad428481 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -2485,7 +2485,7 @@ function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, Plan
       PlanService.changePlan($scope, org.name, $scope.holder.currentPlan.stripeId, callbacks);
     }, function(result) {
       $scope.creating = false;
-      $scope.createError = result.data.message || result.data;
+      $scope.createError = result.data.error_description || result.data;
       $timeout(function() {
         $('#orgName').popover('show');
       });
diff --git a/static/partials/new-organization.html b/static/partials/new-organization.html
index 5f4756cfe..463c3784d 100644
--- a/static/partials/new-organization.html
+++ b/static/partials/new-organization.html
@@ -54,7 +54,7 @@
             <label for="orgName">Organization Name</label>
             <input id="orgName" name="orgName" type="text" class="form-control" placeholder="Organization Name"
                    ng-model="org.name" required autofocus data-trigger="manual" data-content="{{ createError }}"
-                   data-placement="right" data-container="body">
+                   data-placement="right" data-container="body" ng-pattern="/^[a-z0-9_]{4,30}$/">
             <span class="description">This will also be the namespace for your repositories</span>
           </div>