Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
14 changes: 7 additions & 7 deletions front/js/settings_utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
let inputType = "text";
let readOnly = "";
let isMultiSelect = false;
let isOrdeable = false;
let isOrderable = false;
let cssClasses = "";
let placeholder = "";
let suffix = "";
Expand Down Expand Up @@ -820,8 +820,8 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
if (option.multiple === "true") {
isMultiSelect = true;
}
if (option.ordeable === "true") {
isOrdeable = true;
if (option.orderable === "true") {
isOrderable = true;
}
if (option.editable === "true") {
editable = true;
Expand Down Expand Up @@ -877,7 +877,7 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
inputType,
readOnly,
isMultiSelect,
isOrdeable,
isOrderable,
cssClasses,
placeholder,
suffix,
Expand Down Expand Up @@ -1076,7 +1076,7 @@ function collectSetting(prefix, setCodeName, setType, settingsArray) {
},
array: () => {
let temps = [];
if (opts.isOrdeable) {
if (opts.isOrderable) {
temps = $(`#${setCodeName}`).val();
} else {
const sel = $(`#${setCodeName}`).attr("my-editable") === "true" ? "" : ":selected";
Expand Down Expand Up @@ -1189,7 +1189,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
inputType,
readOnly,
isMultiSelect,
isOrdeable,
isOrderable,
cssClasses,
placeholder,
suffix,
Expand Down Expand Up @@ -1225,7 +1225,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
switch (elementType) {
case 'select':
const multi = isMultiSelect ? "multiple" : "";
const addCss = isOrdeable ? "select2 select2-hidden-accessible" : "";
const addCss = isOrderable ? "select2 select2-hidden-accessible" : "";

inputHtml += `<select onChange="settingsChanged();${onChange}"
onfocusout="${focusout}"
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/__template/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -372,7 +372,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/adguard_import/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -348,7 +348,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
8 changes: 4 additions & 4 deletions front/plugins/arp_scan/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -305,7 +305,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -338,7 +338,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -387,7 +387,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/asuswrt_import/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -169,7 +169,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/avahi_scan/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -264,7 +264,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/ddns_update/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -477,7 +477,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down
8 changes: 4 additions & 4 deletions front/plugins/dhcp_leases/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -720,7 +720,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -753,7 +753,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -802,7 +802,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/dhcp_servers/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -519,7 +519,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/dig_scan/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -272,7 +272,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/freebox/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -345,7 +345,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/icmp_scan/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -335,7 +335,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
8 changes: 4 additions & 4 deletions front/plugins/internet_ip/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -369,7 +369,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -418,7 +418,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -449,7 +449,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/internet_speedtest/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down Expand Up @@ -610,7 +610,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/ipneigh/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -173,7 +173,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/luci_import/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -422,7 +422,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
4 changes: 2 additions & 2 deletions front/plugins/mikrotik_scan/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down Expand Up @@ -307,7 +307,7 @@
"elements": [
{
"elementType": "select",
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
"transformers": []
}
]
Expand Down
Loading