Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-09 15:55:23 +02:00
Code Issues Releases Activity

Fix settings update

Browse source
This commit is contained in:
Prabhat Khera 2023-06-02 17:21:28 +12:00
parent 8d7fcde4cb
commit 5ce938123d
3 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
api/dataservices/endpoint/endpoint.go
View file

@ -22,19 +22,6 @@ func NewService(connection portainer.Connection) (*Service, error) {
idxEdgeID: make(map[string]portainer.EndpointID),
}
es, err := s.endpoints()
if err != nil {
return nil, err
}
for _, e := range es {
if len(e.EdgeID) > 0 {
s.idxEdgeID[e.EdgeID] = e.ID
}
s.heartbeats.Store(e.ID, e.LastCheckInDate)
}
return s, nil
}

2
api/dataservices/settings/settings.go
View file

@ -44,7 +44,7 @@ func (service *Service) Settings() (*portainer.Settings, error) {
// UpdateSettings persists a Settings object.
func (service *Service) UpdateSettings(settings *portainer.Settings) error {
db := service.connection.GetDB()
tx := db.Model(&portainer.Settings{}).Where(portainer.Settings{ID: 1}).FirstOrCreate(settings)
tx := db.Model(&portainer.Settings{}).Where(portainer.Settings{ID: 1}).Save(settings)
if tx.Error != nil {
return tx.Error
}

18
api/http/handler/settings/settings_update.go
View file

@ -1,6 +1,7 @@
package settings
import (
"fmt"
"net/http"
"strings"
"time"
@ -119,15 +120,16 @@ func (handler *Handler) settingsUpdate(w http.ResponseWriter, r *http.Request) *
return httperror.BadRequest("Invalid request payload", err)
}
fmt.Println(featureflags.IsEnabled(portainer.FeatureNoTx), "********************************")
var settings *portainer.Settings
if featureflags.IsEnabled(portainer.FeatureNoTx) {
settings, err = handler.updateSettings(handler.DataStore, payload)
} else {
// err = handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
// settings, err = handler.updateSettings(tx, payload)
// return err
// })
}
//if featureflags.IsEnabled(portainer.FeatureNoTx) {
settings, err = handler.updateSettings(handler.DataStore, payload)
//} else {
// err = handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
// settings, err = handler.updateSettings(tx, payload)
// return err
// })
//}
if err != nil {
var httpErr *httperror.HandlerError