diff --git a/backend/app/service/device.go b/backend/app/service/device.go index 9f1442478e74..28da10c786e9 100644 --- a/backend/app/service/device.go +++ b/backend/app/service/device.go @@ -326,7 +326,9 @@ func updateDNS(list []string) error { } } for _, item := range list { - newFile += fmt.Sprintf("nameserver %s \n", item) + if len(item) != 0 { + newFile += fmt.Sprintf("nameserver %s \n", item) + } } file, err := os.OpenFile(defaultDNSPath, os.O_WRONLY|os.O_TRUNC, 0640) if err != nil { diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue index d499517d1d54..492d53159ff8 100644 --- a/frontend/src/views/container/compose/index.vue +++ b/frontend/src/views/container/compose/index.vue @@ -36,7 +36,6 @@
- + {{ form.imageName.substring(0, 50) }}...:{{ form.oldTag }} diff --git a/frontend/src/views/container/image/index.vue b/frontend/src/views/container/image/index.vue index 451dd1788410..2f85bfceeca6 100644 --- a/frontend/src/views/container/image/index.vue +++ b/frontend/src/views/container/image/index.vue @@ -28,7 +28,6 @@
{ }; const onDelete = (row: Container.ImageInfo) => { - let names = row.tags; + let names = row.tags || [row.id.replaceAll('sha256:', '').substring(0, 12)]; opRef.value.acceptParams({ title: i18n.global.t('commons.button.delete'), names: names, @@ -243,7 +242,7 @@ const buttons = [ label: i18n.global.t('container.tag'), click: (row: Container.ImageInfo) => { let params = { - itemName: row.tags.length !== 0 ? row.tags[0].split(':')[0] : '', + itemName: row.tags && row.tags?.length !== 0 ? row.tags[0].split(':')[0] : '', repos: repos.value, sourceID: row.id, }; @@ -273,16 +272,16 @@ const buttons = [ { label: i18n.global.t('commons.button.delete'), click: async (row: Container.ImageInfo) => { - if (!row.tags?.length || row.tags.length <= 1) { + if (row.tags && row.tags.length > 1) { + let params = { + id: row.id, + isUsed: row.isUsed, + tags: row.tags, + }; + dialogDeleteRef.value!.acceptParams(params); + } else { onDelete(row); - return; } - let params = { - id: row.id, - isUsed: row.isUsed, - tags: row.tags, - }; - dialogDeleteRef.value!.acceptParams(params); }, }, ]; diff --git a/frontend/src/views/container/network/index.vue b/frontend/src/views/container/network/index.vue index bea5eee34c67..49e1666f127a 100644 --- a/frontend/src/views/container/network/index.vue +++ b/frontend/src/views/container/network/index.vue @@ -25,7 +25,6 @@
diff --git a/frontend/src/views/host/firewall/ip/index.vue b/frontend/src/views/host/firewall/ip/index.vue index 91c67e2c5653..096dc9cfee8b 100644 --- a/frontend/src/views/host/firewall/ip/index.vue +++ b/frontend/src/views/host/firewall/ip/index.vue @@ -34,7 +34,6 @@