Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9065, settings v2/v3 conflict

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-12-05 14:45:58 -05:00
parent 970ccb5a68
commit 91c20ceca5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/admin/settings/api.js
View File

@@ -4,9 +4,7 @@ define('admin/settings/api', ['settings'], function (settings) {
var ACP = {}; var ACP = {};
ACP.init = function () { ACP.init = function () {
const saveEl = $('#save');
settings.load('core.api', $('.core-api-settings')); settings.load('core.api', $('.core-api-settings'));
saveEl.off('click'); // override settingsv1 handling
$('#save').on('click', saveSettings); $('#save').on('click', saveSettings);
$(window).on('action:settings.sorted-list.loaded', (ev, { element }) => { $(window).on('action:settings.sorted-list.loaded', (ev, { element }) => {

6
src/views/admin/settings/api.tpl
View File

@@ -1,5 +1,3 @@
<!-- IMPORT admin/partials/settings/header.tpl -->
<form role="form" class="core-api-settings"> <form role="form" class="core-api-settings">
<p class="lead">[[admin/settings/api:lead-text]]</p> <p class="lead">[[admin/settings/api:lead-text]]</p>
<p>[[admin/settings/api:intro]]</p> <p>[[admin/settings/api:intro]]</p>
@@ -37,4 +35,6 @@
</div> </div>
</form> </form>
<!-- IMPORT admin/partials/settings/footer.tpl --> <button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
<i class="material-icons">save</i>
</button>