diff options
| author | Felix A. Epp <work@felixepp.de> | 2017-01-23 16:29:16 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-04-25 00:22:01 +0200 |
| commit | 5e5aa2eeebc6df41664ecb59f571a9f634ba8e66 (patch) | |
| tree | 7332914a2cb8242daf0212ddfa3761b87dc71503 /settings | |
| parent | c51c41b2af25d888dcc2276d50a4848519eddb92 (diff) | |
| download | nextcloud-server-5e5aa2eeebc6df41664ecb59f571a9f634ba8e66.tar.gz nextcloud-server-5e5aa2eeebc6df41664ecb59f571a9f634ba8e66.zip | |
Fix uninstall in tabular view
Signed-off-by: Felix A. Epp <work@felixepp.de>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/apps.js | 4 | ||||
| -rw-r--r-- | settings/templates/apps.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index bde069e1b27..80ac732730f 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -455,8 +455,8 @@ OC.Settings.Apps = OC.Settings.Apps || { element.val(t('settings','Uninstall')); } else { OC.Settings.Apps.rebuildNavigation(); - element.parent().fadeOut(function() { - element.remove(); + element.parents('#apps-list > .section').fadeOut(function() { + this.remove(); }); } },'json'); diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 652dc38557d..e3e9ad97d6f 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -60,15 +60,15 @@ script( <p><?php p($l->t('This app has an update available.')); ?></p> </div> <div class="warning hidden"></div> + <input class="update hidden" type="submit" value="<?php p($l->t('Update to %s', array('{{update}}'))); ?>" data-appid="{{id}}" /> + {{#if canUnInstall}} + <input class="uninstall" type="submit" value="<?php p($l->t('Uninstall')); ?>" data-appid="{{id}}" /> + {{/if}} {{#if active}} <input class="enable" type="submit" data-appid="{{id}}" data-active="true" value="<?php p($l->t("Disable"));?>"/> {{else}} <input class="enable{{#if needsDownload}} needs-download{{/if}}" type="submit" data-appid="{{id}}" data-active="false" {{#unless canInstall}}disabled="disabled"{{/unless}} value="<?php p($l->t("Enable"));?>"/> {{/if}} - <input class="update hidden" type="submit" value="<?php p($l->t('Update to %s', array('{{update}}'))); ?>" data-appid="{{id}}" /> - {{#if canUnInstall}} - <input class="uninstall" type="submit" value="<?php p($l->t('Uninstall app')); ?>" data-appid="{{id}}" /> - {{/if}} </div> </div> </script> |