refactor(FilterManager): rename country and provider variables to serverCountry and serverProvider for clarity and consistency
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 3m3s
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 3m3s
This commit is contained in:
@@ -806,8 +806,8 @@ function FilterManager() {
|
|||||||
|
|
||||||
const serverDns = matchedServer?.dns || matchedServer?.hostName || selectedServer.name || '';
|
const serverDns = matchedServer?.dns || matchedServer?.hostName || selectedServer.name || '';
|
||||||
const serverId = matchedServer?.id || matchedServer?.ip || selectedServer.id || selectedServer.name || '';
|
const serverId = matchedServer?.id || matchedServer?.ip || selectedServer.id || selectedServer.name || '';
|
||||||
const country = matchedServer?.country || '';
|
const serverCountry = matchedServer?.country || '';
|
||||||
const provider = matchedServer?.provider || '';
|
const serverProvider = matchedServer?.provider || '';
|
||||||
|
|
||||||
const gws = [];
|
const gws = [];
|
||||||
|
|
||||||
@@ -832,8 +832,8 @@ function FilterManager() {
|
|||||||
ip: gw.ip,
|
ip: gw.ip,
|
||||||
comment: gw.description || '',
|
comment: gw.description || '',
|
||||||
serverDns: serverDns,
|
serverDns: serverDns,
|
||||||
country: country,
|
country: gw.country || serverCountry,
|
||||||
provider: provider,
|
provider: gw.provider || serverProvider,
|
||||||
primary: false // В network-config нет поля primary, но можно добавить если нужно
|
primary: false // В network-config нет поля primary, но можно добавить если нужно
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -848,8 +848,8 @@ function FilterManager() {
|
|||||||
ip: gw.ip || '',
|
ip: gw.ip || '',
|
||||||
comment: gw.comment || '',
|
comment: gw.comment || '',
|
||||||
serverDns: serverDns,
|
serverDns: serverDns,
|
||||||
country: country,
|
country: gw.country || serverCountry,
|
||||||
provider: provider,
|
provider: gw.provider || serverProvider,
|
||||||
primary: gw.primary
|
primary: gw.primary
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -866,8 +866,8 @@ function FilterManager() {
|
|||||||
ip: gw.ip || '',
|
ip: gw.ip || '',
|
||||||
comment: gw.comment || '',
|
comment: gw.comment || '',
|
||||||
serverDns: serverDns,
|
serverDns: serverDns,
|
||||||
country: country,
|
country: gw.country || serverCountry,
|
||||||
provider: provider,
|
provider: gw.provider || serverProvider,
|
||||||
primary: gw.primary
|
primary: gw.primary
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user