ric/dockge
1
0
Fork 0
mirror of https://github.com/louislam/dockge.git synced 2025-02-22 19:45:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(deps): update from upstream

Browse source 
Merge branch 'feat/dockge-agents-friendly-name' into feat/dockge-agents-friendly-name-editable
This commit is contained in:
stroskler 2024-02-06 06:53:17 +00:00
commit 5885665b4d
No known key found for this signature in database
GPG key ID: BFC1D7C45DD50847
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frontend/src/mixins/socket.ts
View file

@ -131,10 +131,15 @@ export default defineComponent({
methods: { methods: {
endpointDisplayFunction(endpoint : string) { endpointDisplayFunction(endpoint : string) {
if (endpoint) { for (const [k, v] of Object.entries(this.$data.agentList)) {
return endpoint; if (endpoint) {
} else { if (endpoint === v["endpoint"] && v["friendlyname"] !== "") {
return this.$t("currentEndpoint"); return v["friendlyname"];
}
if (endpoint === v["endpoint"] && v["friendlyname"] === "" ) {
return endpoint;
}
}
} }
}, },

2
frontend/src/pages/Compose.vue
View file

@ -99,7 +99,7 @@
<label for="name" class="form-label">{{ $t("dockgeAgent") }}</label> <label for="name" class="form-label">{{ $t("dockgeAgent") }}</label>
<select v-model="stack.endpoint" class="form-select"> <select v-model="stack.endpoint" class="form-select">
<option v-for="(agent, endpoint) in $root.agentList" :key="endpoint" :value="endpoint" :disabled="$root.agentStatusList[endpoint] != 'online'"> <option v-for="(agent, endpoint) in $root.agentList" :key="endpoint" :value="endpoint" :disabled="$root.agentStatusList[endpoint] != 'online'">
({{ $root.agentStatusList[endpoint] }}) {{ (endpoint) ? endpoint : $t("currentEndpoint") }} ({{ $root.agentStatusList[endpoint] }}) {{ (agent.friendlyname !== '') ? agent.friendlyname : agent.url || $t("Controller") }}
</option> </option>
</select> </select>
</div> </div>