jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Handle location form submit errors for (sub)domains

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-16 19:58:15 +02:00
parent bb0ab03ad9
commit b602a9d15d
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/app.html
View File

@@ -232,9 +232,8 @@
<div class="col-md-12">
<fieldset>
<form role="form" name="locationForm" ng-submit="location.submit()" autocomplete="off">
<div class="has-error text-center" ng-show="location.error.other">{{ location.error.other }}</div>
<div class="form-group" ng-class="{ 'has-error': (locationForm.location.$dirty && locationForm.location.$invalid) || (!locationForm.location.$dirty && location.error.location) }">
<label class="control-label" for="locationLocationInput">Domain {{ location.error.location }} </label>
<label class="control-label" for="locationLocationInput">{{ location.error.location }} </label>
<div class="input-group form-inline">
<input type="text" class="form-control" ng-model="location.location" id="locationLocationInput" name="location" placeholder="{{ 'Leave empty to use bare domain' }}" autofocus>

11
src/views/app.js
View File

@@ -197,6 +197,17 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
};
Client.configureApp($scope.app.id, 'location', data, function (error) {
if (error && error.statusCode === 409) {
if (error.location && error.domain) {
$scope.location.error.location = error.message;
$scope.locationForm.$setPristine();
} else {
$scope.location.error.alternateDomains = error.message;
}
$scope.location.busy = false;
return;
}
if (error) return Client.error(error);
$scope.location.success = true;