diff options
| author | tomneedham <tom@owncloud.com> | 2014-02-17 11:03:57 +0000 |
|---|---|---|
| committer | tomneedham <tom@owncloud.com> | 2014-02-17 11:03:57 +0000 |
| commit | a4b6d667038be9ca82c51fd0e22e7f3e51cb1e17 (patch) | |
| tree | 1b456e75e10dde0f5a65af47420daa0abfd0fdf5 /apps/files_encryption/js/detect-migration.js | |
| parent | 049e03c2b92e10ef94d1f7bc900e74f078a56a9b (diff) | |
| parent | 5a8d37023a84d933eaa5113400014805048a689b (diff) | |
| download | nextcloud-server-a4b6d667038be9ca82c51fd0e22e7f3e51cb1e17.tar.gz nextcloud-server-a4b6d667038be9ca82c51fd0e22e7f3e51cb1e17.zip | |
Merge branch 'master' into migration_unit_tests
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'); } } }); |