Merge remote-tracking branch 'origin/dev' into dev

siyuan-note · Oct 13, 2023 · 0c4aee7 · 0c4aee7
2 parents c34d84c + daa9ddf
commit 0c4aee7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/kernel/av/av.go b/kernel/av/av.go
@@ -521,7 +521,11 @@ func SaveAttributeView(av *AttributeView) (err error) {
 			for _, v := range kv.Values {
 				if 0 == v.Block.Created {
 					if "" == v.Block.ID {
-						v.Block.ID = ast.NewNodeID()
+						v.Block.ID = v.BlockID
+						if "" == v.Block.ID {
+							v.Block.ID = ast.NewNodeID()
+							v.BlockID = v.Block.ID
+						}
 					}
 
 					createdStr := v.Block.ID[:len("20060102150405")]

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
@@ -191,7 +191,11 @@ func RenderAttributeView(avID string) (viewable av.Viewable, attrView *av.Attrib
 			for _, v := range kv.Values {
 				if 0 == v.Block.Created {
 					if "" == v.Block.ID {
-						v.Block.ID = ast.NewNodeID()
+						v.Block.ID = v.BlockID
+						if "" == v.Block.ID {
+							v.Block.ID = ast.NewNodeID()
+							v.BlockID = v.Block.ID
+						}
 					}
 
 					createdStr := v.Block.ID[:len("20060102150405")]

diff --git a/kernel/model/plugin.go b/kernel/model/plugin.go
@@ -74,7 +74,7 @@ func SetPetalEnabled(name string, enabled bool, frontend string) (ret *Petal, er
 func LoadPetals(frontend string) (ret []*Petal) {
 	ret = []*Petal{}
 
-	if Conf.Bazaar.PetalDisabled {
+	if Conf.Bazaar.PetalDisabled || !Conf.Bazaar.Trust {
 		return
 	}