diff --git a/server/service/asset.go b/server/service/asset.go index df49195..989b0ed 100644 --- a/server/service/asset.go +++ b/server/service/asset.go @@ -267,21 +267,23 @@ func (s assetService) UpdateById(id string, m maps.Map) error { item.Description = "-" } + if item.AccessGatewayId == "" { + item.AccessGatewayId = "-" + } + if err := s.Encrypt(&item, config.GlobalCfg.EncryptionPassword); err != nil { return err } - return env.GetDB().Transaction(func(tx *gorm.DB) error { - c := s.Context(tx) - if err := repository.AssetRepository.UpdateById(c, &item, id); err != nil { + return s.Transaction(context.Background(), func(ctx context.Context) error { + if err := repository.AssetRepository.UpdateById(ctx, &item, id); err != nil { return err } - if err := repository.AssetRepository.UpdateAttributes(c, id, item.Protocol, m); err != nil { + if err := repository.AssetRepository.UpdateAttributes(ctx, id, item.Protocol, m); err != nil { return err } return nil }) - } func (s assetService) FixSshMode() error { diff --git a/web/src/components/asset/AssetModal.js b/web/src/components/asset/AssetModal.js index d044615..7c32769 100644 --- a/web/src/components/asset/AssetModal.js +++ b/web/src/components/asset/AssetModal.js @@ -61,8 +61,6 @@ const AssetModal = function ({ let [tags, setTags] = useState([]); let [credentials, setCredentials] = useState([]); - const [current, setCurrent] = useState(0); - const getStorages = async () => { const result = await request.get('/storages/shares'); if (result.code === 1) { @@ -70,11 +68,6 @@ const AssetModal = function ({ } } - const handleStepChange = (value) => { - console.log('onChange:', current); - setCurrent(value); - }; - useEffect(() => { const getItem = async () => {