Fix UI for duplicate emails
This commit is contained in:
parent
1f533edf95
commit
6548b251be
2 changed files with 3 additions and 3 deletions
|
@ -1434,7 +1434,7 @@ function OrgViewCtrl($rootScope, $scope, ApiService, $routeParams) {
|
||||||
loadOrganization();
|
loadOrganization();
|
||||||
}
|
}
|
||||||
|
|
||||||
function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService, PlanService, ApiService) {
|
function OrgAdminCtrl($rootScope, $scope, $timeout, Restangular, $routeParams, UserService, PlanService, ApiService) {
|
||||||
var orgname = $routeParams.orgname;
|
var orgname = $routeParams.orgname;
|
||||||
|
|
||||||
// Load the list of plans.
|
// Load the list of plans.
|
||||||
|
@ -1481,7 +1481,7 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
|
||||||
$scope.changingOrganization = false;
|
$scope.changingOrganization = false;
|
||||||
$scope.changeEmailForm.$setPristine();
|
$scope.changeEmailForm.$setPristine();
|
||||||
$scope.organization = org;
|
$scope.organization = org;
|
||||||
}, function(resp) {
|
}, function(result) {
|
||||||
$scope.changingOrganization = false;
|
$scope.changingOrganization = false;
|
||||||
$scope.changeEmailError = result.data.message;
|
$scope.changeEmailError = result.data.message;
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
<div class="panel-title">Organization's e-mail address</div>
|
<div class="panel-title">Organization's e-mail address</div>
|
||||||
<div class="panel-content" style="padding-left: 20px; margin-top: 10px;">
|
<div class="panel-content" style="padding-left: 20px; margin-top: 10px;">
|
||||||
<form class="form-change" id="changeEmailForm" name="changeEmailForm" ng-submit="changeEmail()" data-trigger="manual"
|
<form class="form-change" id="changeEmailForm" name="changeEmailForm" ng-submit="changeEmail()" data-trigger="manual"
|
||||||
data-content="{{ changeEmailError }}" data-placement="right" ng-show="!updatingOrganization">
|
data-content="{{ changeEmailError }}" data-placement="bottom" ng-show="!updatingOrganization">
|
||||||
<img src="//www.gravatar.com/avatar/{{ organizationEmail | gravatar }}?s=24&d=identicon">
|
<img src="//www.gravatar.com/avatar/{{ organizationEmail | gravatar }}?s=24&d=identicon">
|
||||||
<input type="email" class="form-control" ng-model="organizationEmail"
|
<input type="email" class="form-control" ng-model="organizationEmail"
|
||||||
style="margin-left: 10px; margin-right: 10px; width: 400px; display: inline-block;" required>
|
style="margin-left: 10px; margin-right: 10px; width: 400px; display: inline-block;" required>
|
||||||
|
|
Reference in a new issue