github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(dbfs): set current version is not executed from existing transaction

pull/2358/head
Aaron Liu 2025-04-27 10:37:33 +08:00
parent ca47f79ecb
commit 67d3b25c87
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/statics/statics.go
View File

@ -8,6 +8,10 @@ import (
_ "embed" _ "embed"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/cloudreve/Cloudreve/v4/application/constants"
"github.com/cloudreve/Cloudreve/v4/pkg/logging"
"github.com/cloudreve/Cloudreve/v4/pkg/util"
"github.com/gin-contrib/static"
"io" "io"
"io/fs" "io/fs"
"net/http" "net/http"
@ -16,11 +20,6 @@ import (
"sort" "sort"
"strings" "strings"
"time" "time"
"github.com/cloudreve/Cloudreve/v4/application/constants"
"github.com/cloudreve/Cloudreve/v4/pkg/logging"
"github.com/cloudreve/Cloudreve/v4/pkg/util"
"github.com/gin-contrib/static"
) )
const StaticFolder = "statics" const StaticFolder = "statics"

3
pkg/filemanager/fs/dbfs/manage.go
View File

@ -651,7 +651,8 @@ func (f *DBFS) setCurrentVersion(ctx context.Context, target *File, versionId in
return serializer.NewError(serializer.CodeDBError, "Failed to start transaction", err) return serializer.NewError(serializer.CodeDBError, "Failed to start transaction", err)
} }
if err := f.fileClient.SetPrimaryEntity(ctx, target.Model, targetVersion.ID()); err != nil { if err := fc.SetPrimaryEntity(ctx, target.Model, targetVersion.ID()); err != nil {
_ = inventory.Rollback(tx)
return serializer.NewError(serializer.CodeDBError, "Failed to set primary entity", err) return serializer.NewError(serializer.CodeDBError, "Failed to set primary entity", err)
} }