diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-10 12:57:18 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-07-29 13:39:05 +0200 |
| commit | e15e394fccf5dc0be8df9f6f2619214ca2326f80 (patch) | |
| tree | 02a7d0dee988143ea5cd46747a5f4ab1cae45232 /settings | |
| parent | 2c8e5ec84ff98088fb9e3b275735098beaa5e27f (diff) | |
| download | nextcloud-server-e15e394fccf5dc0be8df9f6f2619214ca2326f80.tar.gz nextcloud-server-e15e394fccf5dc0be8df9f6f2619214ca2326f80.zip | |
add ajax call to decrypt all files
Conflicts:
apps/files_encryption/lib/crypt.php
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/personal.js | 13 | ||||
| -rw-r--r-- | settings/personal.php | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js index 099c1426dc0..97342e7653e 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -110,6 +110,19 @@ $(document).ready(function(){ }); return false; }); + + $('button:button[name="submitDecryptAll"]').click(function() { + console.log("click!"); + $.post('ajax/decryptall.php', {}, function(data) { + /* + if (data.status === "error") { + OC.msg.finishedSaving('#encryption .msg', data); + } else { + OC.msg.finishedSaving('#encryption .msg', data); + }*/ + } + ); + }); } ); OC.msg={ diff --git a/settings/personal.php b/settings/personal.php index 4961661e250..79ce8e4576b 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -89,7 +89,7 @@ $tmpl->assign('activelanguage', $userLang); $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser())); $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser())); $tmpl->assign('displayName', OC_User::getDisplayName()); -$tmpl->assign('enableDecryptAll' , true); +$tmpl->assign('enableDecryptAll' , $enableDecryptAll); $forms=OC_App::getForms('personal'); $tmpl->assign('forms', array()); |