From d8864d4f4bd54a314b1d7c7945578b95f24477d1 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 14 Apr 2012 12:57:03 +0200 Subject: show error when installing an app has failed --- settings/js/apps.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'settings/js/apps.js') diff --git a/settings/js/apps.js b/settings/js/apps.js index e2f882c6fec..0f9181a2c75 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -28,10 +28,18 @@ $(document).ready(function(){ var active=$(this).data('active'); if(app){ if(active){ - $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app}); + $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){ + if(!result || result.status!='succes'){ + OC.dialogs.alert('Error','Error while enabling app'); + } + },'json'); $('#leftcontent li[data-id="'+app+'"]').removeClass('active'); }else{ - $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app}); + $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){ + if(!result || result.status!='succes'){ + OC.dialogs.alert('Error','Error while disabling app'); + } + },'json'); $('#leftcontent li[data-id="'+app+'"]').addClass('active'); } active=!active; -- cgit v1.2.3 From 386663ddb64453690ff12b739a1ad564dddeb1ed Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 14 Apr 2012 13:16:37 +0200 Subject: swap enable and dissable error messages --- settings/js/apps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'settings/js/apps.js') diff --git a/settings/js/apps.js b/settings/js/apps.js index 0f9181a2c75..bd7a8e9f84c 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -30,14 +30,14 @@ $(document).ready(function(){ if(active){ $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){ if(!result || result.status!='succes'){ - OC.dialogs.alert('Error','Error while enabling app'); + OC.dialogs.alert('Error','Error while disabling app'); } },'json'); $('#leftcontent li[data-id="'+app+'"]').removeClass('active'); }else{ $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){ if(!result || result.status!='succes'){ - OC.dialogs.alert('Error','Error while disabling app'); + OC.dialogs.alert('Error','Error while enabling app'); } },'json'); $('#leftcontent li[data-id="'+app+'"]').addClass('active'); -- cgit v1.2.3 From 8113a432522d756378d42df7e06d386f55146a80 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 14 Apr 2012 18:09:31 +0200 Subject: typo --- settings/js/apps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'settings/js/apps.js') diff --git a/settings/js/apps.js b/settings/js/apps.js index bd7a8e9f84c..12d09ac69db 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -29,14 +29,14 @@ $(document).ready(function(){ if(app){ if(active){ $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){ - if(!result || result.status!='succes'){ + if(!result || result.status!='success'){ OC.dialogs.alert('Error','Error while disabling app'); } },'json'); $('#leftcontent li[data-id="'+app+'"]').removeClass('active'); }else{ $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){ - if(!result || result.status!='succes'){ + if(!result || result.status!='success'){ OC.dialogs.alert('Error','Error while enabling app'); } },'json'); -- cgit v1.2.3