1
0
mirror of https://github.com/bitwarden/web synced 2025-12-06 00:03:28 +00:00

import validation

This commit is contained in:
Kyle Spearrin
2016-10-17 23:18:19 -04:00
parent e7a9699226
commit 517ea65bc9
3 changed files with 14 additions and 3 deletions

View File

@@ -5,6 +5,11 @@
var _service = {}; var _service = {};
_service.import = function (source, file, success, error) { _service.import = function (source, file, success, error) {
if (!file) {
error();
return;
}
switch (source) { switch (source) {
case 'local': case 'local':
importLocal(file, success, error); importLocal(file, success, error);

View File

@@ -25,10 +25,16 @@
}, importError); }, importError);
} }
function importError() { function importError(errorMessage) {
$analytics.eventTrack('Import Data Failed', { label: $scope.model.source });
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');
if (errorMessage) {
toastr.error(errorMessage);
}
else {
toastr.error('Something went wrong. Try again.', 'Oh No!'); toastr.error('Something went wrong. Try again.', 'Oh No!');
} }
}
$scope.close = function () { $scope.close = function () {
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');

View File

@@ -18,7 +18,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="file">File</label> <label for="file">File</label>
<input type="file" id="file" name="file" /> <input type="file" id="file" name="file" required />
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">