mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: sync config is not enabled #820

Browse source
This commit is contained in:
Jacky 2025-01-23 15:29:33 +08:00
parent a48f7145d7
commit 6957e4fb8e
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
5 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/components/StdDesign/StdDataDisplay/StdTable.vue
View file

@ -493,10 +493,6 @@ const paginationSize = computed(() => {
> >
{{ $gettext('View') }} {{ $gettext('View') }}
</AButton> </AButton>
<ADivider
v-if="!props.disableModify"
type="vertical"
/>
</template> </template>
<template v-if="!props.disableModify && !inTrash"> <template v-if="!props.disableModify && !inTrash">
@ -507,7 +503,6 @@ const paginationSize = computed(() => {
> >
{{ $gettext('Modify') }} {{ $gettext('Modify') }}
</AButton> </AButton>
<ADivider type="vertical" />
</template> </template>
<slot <slot
@ -544,7 +539,6 @@ const paginationSize = computed(() => {
{{ $gettext('Recover') }} {{ $gettext('Recover') }}
</AButton> </AButton>
</APopconfirm> </APopconfirm>
<ADivider type="vertical" />
<APopconfirm <APopconfirm
v-if="inTrash" v-if="inTrash"
:cancel-text="$gettext('No')" :cancel-text="$gettext('No')"

1
app/src/views/config/ConfigList.vue
View file

@ -157,7 +157,6 @@ const refRename = useTemplateRef('refRename')
> >
{{ $gettext('Modify') }} {{ $gettext('Modify') }}
</AButton> </AButton>
<ADivider type="vertical" />
<AButton <AButton
type="link" type="link"
size="small" size="small"

2
app/src/views/site/site_list/SiteList.vue
View file

@ -135,7 +135,6 @@ function handleBatchUpdated() {
> >
{{ $gettext('Enable') }} {{ $gettext('Enable') }}
</AButton> </AButton>
<ADivider type="vertical" />
<AButton <AButton
type="link" type="link"
size="small" size="small"
@ -143,7 +142,6 @@ function handleBatchUpdated() {
> >
{{ $gettext('Duplicate') }} {{ $gettext('Duplicate') }}
</AButton> </AButton>
<ADivider type="vertical" />
<APopconfirm <APopconfirm
:cancel-text="$gettext('No')" :cancel-text="$gettext('No')"
:ok-text="$gettext('OK')" :ok-text="$gettext('OK')"

2
app/src/views/stream/StreamList.vue
View file

@ -151,7 +151,6 @@ function handleAddStream() {
> >
{{ $gettext('Enable') }} {{ $gettext('Enable') }}
</AButton> </AButton>
<ADivider type="vertical" />
<AButton <AButton
type="link" type="link"
size="small" size="small"
@ -159,7 +158,6 @@ function handleAddStream() {
> >
{{ $gettext('Duplicate') }} {{ $gettext('Duplicate') }}
</AButton> </AButton>
<ADivider type="vertical" />
<APopconfirm <APopconfirm
:cancel-text="$gettext('No')" :cancel-text="$gettext('No')"
:ok-text="$gettext('OK')" :ok-text="$gettext('OK')"

22
internal/site/save.go
View file

@ -46,10 +46,10 @@ func Save(name string, content string, overwrite bool, siteCategoryId uint64, sy
s := query.Site s := query.Site
_, err = s.Where(s.Path.Eq(path)). _, err = s.Where(s.Path.Eq(path)).
Select(s.SiteCategoryID, s.SyncNodeIDs). Select(s.SiteCategoryID, s.SyncNodeIDs).
Updates(&model.Site{ Updates(&model.Site{
SiteCategoryID: siteCategoryId, SiteCategoryID: siteCategoryId,
SyncNodeIDs: syncNodeIds, SyncNodeIDs: syncNodeIds,
}) })
if err != nil { if err != nil {
return return
} }
@ -80,10 +80,10 @@ func syncSave(name string, content string) {
client.SetBaseURL(node.URL) client.SetBaseURL(node.URL)
resp, err := client.R(). resp, err := client.R().
SetHeader("X-Node-Secret", node.Token). SetHeader("X-Node-Secret", node.Token).
SetBody(map[string]interface{}{ SetBody(map[string]interface{}{
"content": content, "content": content,
"overwrite": true, "overwrite": true,
}). }).
Post(fmt.Sprintf("/api/sites/%s", name)) Post(fmt.Sprintf("/api/sites/%s", name))
if err != nil { if err != nil {
notification.Error("Save Remote Site Error", err.Error()) notification.Error("Save Remote Site Error", err.Error())
@ -94,6 +94,12 @@ func syncSave(name string, content string) {
return return
} }
notification.Success("Save Remote Site Success", NewSyncResult(node.Name, name, resp).String()) notification.Success("Save Remote Site Success", NewSyncResult(node.Name, name, resp).String())
// Check if the site is enabled, if so then enable it on the remote node
enabledConfigFilePath := nginx.GetConfPath("sites-enabled", name)
if helper.FileExists(enabledConfigFilePath) {
syncEnable(name)
}
}() }()
} }