diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-02-17 11:13:44 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-02-17 11:13:44 +0100 |
| commit | 5a8d37023a84d933eaa5113400014805048a689b (patch) | |
| tree | 6ec9cb3a014852f58737386231c1ef029dea8808 /apps/files_encryption/js/detect-migration.js | |
| parent | 750ffa82317a6538384a9680d3fe5bc4b0395c70 (diff) | |
| parent | 6778dc5a4a92ba4e808c072a9eae48ff91b6ec74 (diff) | |
| download | nextcloud-server-5a8d37023a84d933eaa5113400014805048a689b.tar.gz nextcloud-server-5a8d37023a84d933eaa5113400014805048a689b.zip | |
Merge pull request #7155 from owncloud/enc_improved_error_handling
[encryption] improved error handling
Diffstat (limited to 'apps/files_encryption/js/detect-migration.js')
| -rw-r--r-- | apps/files_encryption/js/detect-migration.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_encryption/js/detect-migration.js b/apps/files_encryption/js/detect-migration.js index 301e77f24f7..f5627edf4e4 100644 --- a/apps/files_encryption/js/detect-migration.js +++ b/apps/files_encryption/js/detect-migration.js @@ -17,10 +17,14 @@ $(document).ready(function(){ data: {user: user, password: password}, async: false, success: function(response) { - if (response.data.migrationCompleted === false) { + if (response.data.migrationStatus === OC.Encryption.MIGRATION_OPEN) { var message = t('files_encryption', 'Initial encryption started... This can take some time. Please wait.'); $('#messageText').text(message); $('#message').removeClass('hidden').addClass('update'); + } else if (response.data.migrationStatus === OC.Encryption.MIGRATION_IN_PROGRESS) { + var message = t('files_encryption', 'Initial encryption running... Please try again later.'); + $('#messageText').text(message); + $('#message').removeClass('hidden').addClass('update'); } } }); |