aboutsummaryrefslogtreecommitdiffstats
path: root/settings/js/apps.js
diff options
context:
space:
mode:
authorSimon Birnbach <simon@simon-birnbach.de>2012-04-15 15:59:57 +0200
committerSimon Birnbach <simon@simon-birnbach.de>2012-04-15 15:59:57 +0200
commita384fcb99fc3a12d7dac937398bf827c79e86098 (patch)
tree55a631751578cd1f642e5fa0f88fd2290509b126 /settings/js/apps.js
parent4e89a0faf652f2f100cca47cca54a3b35e720aad (diff)
parent38cb716a572a8af136f6260089bc486413c6ca9f (diff)
downloadnextcloud-server-a384fcb99fc3a12d7dac937398bf827c79e86098.tar.gz
nextcloud-server-a384fcb99fc3a12d7dac937398bf827c79e86098.zip
Merge git://gitorious.org/owncloud/owncloud
Conflicts: files/css/files.css files/js/files.js
Diffstat (limited to 'settings/js/apps.js')
-rw-r--r--settings/js/apps.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index e2f882c6fec..12d09ac69db 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!='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});
+ $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){
+ if(!result || result.status!='success'){
+ OC.dialogs.alert('Error','Error while enabling app');
+ }
+ },'json');
$('#leftcontent li[data-id="'+app+'"]').addClass('active');
}
active=!active;