summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-02-23 10:32:19 +0100
committerGitHub <noreply@github.com>2017-02-23 10:32:19 +0100
commit387a77e7e09ced6bfbde32e3d92081d71fe1cfe1 (patch)
tree851ca5d0ec5301824b7c1964047a09425e7d809d /settings/js
parent8bfa50bd1205df73e8417f819715b6e1593202b9 (diff)
parentb138d4fdee3afa8d2b0962698e80d96cb1a02b9e (diff)
downloadnextcloud-server-387a77e7e09ced6bfbde32e3d92081d71fe1cfe1.tar.gz
nextcloud-server-387a77e7e09ced6bfbde32e3d92081d71fe1cfe1.zip
Merge pull request #3590 from individual-it/correct_text_when_disabling_app
show correct text when disabling App
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/apps.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 1538e71a491..b73b4a35b3f 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -292,8 +292,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
OC.Settings.Apps.hideErrorMessage(appId);
groups = groups || [];
var appItem = $('div#app-'+appId+'');
- element.val(t('settings','Enabling app …'));
if(active && !groups.length) {
+ element.val(t('settings','Disabling app …'));
$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appId},function(result) {
if(!result || result.status !== 'success') {
if (result.data && result.data.message) {
@@ -320,6 +320,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
} else {
// TODO: display message to admin to not refresh the page!
// TODO: lock UI to prevent further operations
+ element.val(t('settings','Enabling app …'));
$.post(OC.filePath('settings','ajax','enableapp.php'),{appid: appId, groups: groups},function(result) {
if(!result || result.status !== 'success') {
if (result.data && result.data.message) {