diff options
| -rw-r--r-- | core/css/apps.scss | 3 | ||||
| -rw-r--r-- | settings/js/apps.js | 14 | ||||
| -rw-r--r-- | settings/templates/apps.php | 4 | ||||
| -rw-r--r-- | version.php | 4 |
4 files changed, 14 insertions, 11 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index 633d889f180..fd26f46bcdb 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -117,6 +117,9 @@ kbd { width: 100%; box-sizing: border-box; } + &.hidden { + display: none; + } &.without-app-settings { padding-bottom: 0; } diff --git a/settings/js/apps.js b/settings/js/apps.js index 6bad2cc842c..957ad395f94 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -259,10 +259,10 @@ OC.Settings.Apps = OC.Settings.Apps || { page.find(".groups-enable").hide(); page.find(".groups-enable__checkbox").prop('checked', false); } else { - page.find('#group_select').val((app.groups || []).join('|')); + page.find('.group_select').val((app.groups || []).join('|')); if (app.active) { if (app.groups.length) { - OC.Settings.Apps.setupGroupsSelect(page.find('#group_select')); + OC.Settings.Apps.setupGroupsSelect(page.find('.group_select')); page.find(".groups-enable__checkbox").prop('checked', true); } else { page.find(".groups-enable__checkbox").prop('checked', false); @@ -390,7 +390,7 @@ OC.Settings.Apps = OC.Settings.Apps || { elements.forEach(function(element) { element.val(t('settings', 'Enable')); element.parent().find(".groups-enable").hide(); - element.parent().find('#group_select').hide().val(null); + element.parent().find('.group_select').hide().val(null); }); OC.Settings.Apps.State.apps[appId].active = false; } @@ -458,7 +458,7 @@ OC.Settings.Apps = OC.Settings.Apps || { elements.forEach(function(element) { element.parent().find(".groups-enable").prop('checked', true); element.parent().find(".groups-enable").hide(); - element.parent().find('#group_select').hide().val(null); + element.parent().find('.group_select').hide().val(null); }); } else { elements.forEach(function(element) { @@ -905,8 +905,8 @@ OC.Settings.Apps = OC.Settings.Apps || { OC.Settings.Apps.updateApp(appId, element); }); - $(document).on('change', '#group_select', function() { - var element = $(this).parent().find('input.enable'); + $(document).on('change', '.group_select', function() { + var element = $(this).closest('.section').find('input.enable'); var groups = $(this).val(); if (groups && groups !== '') { groups = groups.split('|'); @@ -922,7 +922,7 @@ OC.Settings.Apps = OC.Settings.Apps || { }); $(document).on('change', ".groups-enable__checkbox", function() { - var $select = $(this).closest('.section').find('#group_select'); + var $select = $(this).closest('.section').find('.group_select'); $select.val(''); if (this.checked) { diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 260b042c078..e32a524f78a 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -59,7 +59,7 @@ script( <div class="groups-enable"> <input type="checkbox" class="groups-enable__checkbox checkbox" id="groups_enable-{{id}}"/> <label for="groups_enable-{{id}}"><?php p($l->t('Limit to groups')); ?></label> - <input type="hidden" id="group_select" title="<?php p($l->t('All')); ?>"> + <input type="hidden" class="group_select" title="<?php p($l->t('All')); ?>"> </div> {{/if}} </div> @@ -182,7 +182,7 @@ script( <input type="checkbox" class="groups-enable__checkbox checkbox" id="groups_enable-{{id}}"/> <label for="groups_enable-{{id}}"><?php p($l->t('Enable only for specific groups')); ?></label> </div> - <input type="hidden" id="group_select" title="<?php p($l->t('All')); ?>" style="width: 200px"> + <input type="hidden" class="group_select" title="<?php p($l->t('All')); ?>" style="width: 200px"> {{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}} diff --git a/version.php b/version.php index 63c4923a486..da1d0a8bb66 100644 --- a/version.php +++ b/version.php @@ -26,10 +26,10 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(12, 0, 0, 23); +$OC_Version = array(12, 0, 0, 24); // The human readable string -$OC_VersionString = '12.0 RC1'; +$OC_VersionString = '12.0 RC2'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ |