Skip to content

Swap Admin4 multiselect plugin #3831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yubiuser wants to merge 4 commits into
base: new/adminLTE4
Choose a base branch
from
Open

Swap Admin4 multiselect plugin #3831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f00c3d4
Switch from tom-select to bootstrap-multiselect
yubiuser Jul 30, 2026
71bdc8b
Change code to use bootstrap-multiselect
yubiuser Jul 30, 2026
1f9173c
Fix CSS
yubiuser Jul 30, 2026
177998e
Remove TOM select traces
yubiuser Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion groups-clients.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
</div><!-- /.container-fluid -->
</div><!-- /.app-content -->

<script src="<?=pihole.fileversion('vendor/tom-select/tom-select.complete.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap-multiselect/bootstrap-multiselect.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap5-toggle/bootstrap5-toggle.jquery.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
Expand Down
2 changes: 1 addition & 1 deletion groups-domains.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
</div><!-- /.container-fluid -->
</div><!-- /.app-content -->

<script src="<?=pihole.fileversion('vendor/tom-select/tom-select.complete.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap-multiselect/bootstrap-multiselect.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap5-toggle/bootstrap5-toggle.jquery.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
Expand Down
2 changes: 1 addition & 1 deletion groups-lists.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
</div><!-- /.container-fluid -->
</div><!-- /.app-content -->

<script src="<?=pihole.fileversion('vendor/tom-select/tom-select.complete.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap-multiselect/bootstrap-multiselect.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap5-toggle/bootstrap5-toggle.jquery.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
Expand Down
2 changes: 1 addition & 1 deletion groups.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
</div><!-- /.container-fluid -->
</div><!-- /.app-content -->

<script src="<?=pihole.fileversion('vendor/tom-select/tom-select.complete.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap-multiselect/bootstrap-multiselect.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap5-toggle/bootstrap5-toggle.jquery.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
Expand Down
46 changes: 12 additions & 34 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"bootstrap": "5.3.8",
"bootstrap-notify": "3.1.3",
"bootstrap5-toggle": "5.4.1",
"bootstrap-multiselect": "2.0.0",
"bstreeview": "1.2.0",
"chart.js": "4.5.1",
"chartjs-adapter-moment": "1.0.1",
Expand All @@ -51,8 +52,7 @@
"nprogress": "0.2.0",
"qrious": "4.0.2",
"select2": "4.1.0",
"select2-bootstrap-5-theme": "1.3.0",
"tom-select": "2.6.1"
"select2-bootstrap-5-theme": "1.3.0"
},
"devDependencies": {
"autoprefixer": "^10.5.0",
Expand Down
2 changes: 1 addition & 1 deletion queries.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
</div><!-- /.container-fluid -->
</div><!-- /.app-content -->

<script src="<?=pihole.fileversion('vendor/tom-select/tom-select.complete.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/bootstrap-multiselect/bootstrap-multiselect.min.js')?>"></script>
<script src="<?=pihole.fileversion('vendor/daterangepicker/daterangepicker.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/queries.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
Expand Down
12 changes: 7 additions & 5 deletions scripts/js/groups-clients.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,17 @@ function initTable() {

// Select assigned groups
selectEl.val(data.groups);
// Initialize Tom Select
const ts = utils.createGroupSelect(selectEl, {
// Initialize group multi-select
const ms = utils.createGroupSelect(selectEl, {
onChange() {
// enable Apply button
if ($(applyBtn).prop("disabled")) {
$(applyBtn)
.addClass("btn-success")
.prop("disabled", false)
.on("click", () => {
$(applyBtn).removeClass("btn-success").prop("disabled", true).off("click");
ms.close();
editClient.call(selectEl);
});
}
Expand All @@ -208,12 +210,12 @@ function initTable() {
return;
}

ts.setValue(data.groups);
ms.setValue(data.groups);
$(applyBtn).removeClass("btn-success").prop("disabled", true).off("click");
},
});
$(ts.dropdown)
.find(".ts-actions-box")
$(ms.dropdown)
.find(".multiselect-actions-box")
.append(
'<button type="button" id=btn_apply_' +
dataId +
Expand Down
12 changes: 7 additions & 5 deletions scripts/js/groups-domains.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,9 @@ function initTable() {

// Select assigned groups
selectEl.val(data.groups);
// Initialize Tom Select
// Initialize group multi-select
const applyBtn = "#btn_apply_" + dataId;
const ts = utils.createGroupSelect(selectEl, {
const ms = utils.createGroupSelect(selectEl, {
onChange() {
// enable Apply button if changes were made to the drop-down menu
// and have it call editDomain() on click
Expand All @@ -244,6 +244,8 @@ function initTable() {
.addClass("btn-success")
.prop("disabled", false)
.on("click", () => {
$(applyBtn).removeClass("btn-success").prop("disabled", true).off("click");
ms.close();
editDomain.call(selectEl);
});
}
Expand All @@ -256,12 +258,12 @@ function initTable() {
return;
}

ts.setValue(data.groups);
ms.setValue(data.groups);
$(applyBtn).removeClass("btn-success").prop("disabled", true).off("click");
},
});
$(ts.dropdown)
.find(".ts-actions-box")
$(ms.dropdown)
.find(".multiselect-actions-box")
.append(
'<button type="button" id=btn_apply_' +
dataId +
Expand Down
12 changes: 7 additions & 5 deletions scripts/js/groups-lists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,17 @@ function initTable() {

// Select assigned groups
selectEl.val(data.groups);
// Initialize Tom Select
const ts = utils.createGroupSelect(selectEl, {
// Initialize group multi-select
const ms = utils.createGroupSelect(selectEl, {
onChange() {
// enable Apply button
if ($(applyBtn).prop("disabled")) {
$(applyBtn)
.addClass("btn-success")
.prop("disabled", false)
.on("click", () => {
$(applyBtn).removeClass("btn-success").prop("disabled", true).off("click");
ms.close();
editList.call(selectEl);
});
}
Expand All @@ -304,12 +306,12 @@ function initTable() {
return;
}

ts.setValue(data.groups);
ms.setValue(data.groups);
$(applyBtn).removeClass("btn-success").prop("disabled", true).off("click");
},
});
$(ts.dropdown)
.find(".ts-actions-box")
$(ms.dropdown)
.find(".multiselect-actions-box")
.append(
'<button type="button" id=btn_apply_' +
dataId +
Expand Down
Loading