Merge branch 'feature/bulk-roi-bugs' into development

pixlise · Apr 17, 2024 · f86e57a · f86e57a
2 parents ab5c4fc + 24ae44f
commit f86e57a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/api/ws/handlers/roi.go b/api/ws/handlers/roi.go
@@ -182,11 +182,18 @@ func createROI(roi *protos.ROIItem, hctx wsHelpers.HandlerContext, needMistEntry
 	// We need to create an ownership item along with it
 	ownerItem := wsHelpers.MakeOwnerForWrite(id, protos.ObjectType_OT_ROI, hctx.SessUser.User.Id, hctx.Svcs.TimeStamper.GetTimeNowSec())
 	if editors != nil {
+		if ownerItem.Editors == nil {
+			ownerItem.Editors = &protos.UserGroupList{}
+		}
+
 		ownerItem.Editors.UserIds = editors.UserIds
 		ownerItem.Editors.GroupIds = editors.GroupIds
 	}
 
 	if viewers != nil {
+		if ownerItem.Viewers == nil {
+			ownerItem.Viewers = &protos.UserGroupList{}
+		}
 		ownerItem.Viewers.UserIds = viewers.UserIds
 		ownerItem.Viewers.GroupIds = viewers.GroupIds
 	}
@@ -262,11 +269,19 @@ func updateROI(roi *protos.ROIItem, hctx wsHelpers.HandlerContext, editors *prot
 	// Check if we need to update the ownership
 	if editors != nil || viewers != nil {
 		if editors != nil {
+			if owner.Editors == nil {
+				owner.Editors = &protos.UserGroupList{}
+			}
+
 			owner.Editors.UserIds = editors.UserIds
 			owner.Editors.GroupIds = editors.GroupIds
 		}
 
 		if viewers != nil {
+			if owner.Viewers == nil {
+				owner.Viewers = &protos.UserGroupList{}
+			}
+
 			owner.Viewers.UserIds = viewers.UserIds
 			owner.Viewers.GroupIds = viewers.GroupIds
 		}

diff --git a/api/ws/wsHelpers/ownership.go b/api/ws/wsHelpers/ownership.go
@@ -21,19 +21,10 @@ func MakeOwnerForWrite(objectId string, objectType protos.ObjectType, creatorUse
 		ObjectType:     objectType,
 		CreatedUnixSec: uint32(createTimeUnixSec),
 		CreatorUserId:  "",
-		Editors: &protos.UserGroupList{
-			UserIds:  []string{},
-			GroupIds: []string{},
-		},
-		Viewers: &protos.UserGroupList{
-			UserIds:  []string{},
-			GroupIds: []string{},
-		},
 	}
 
 	if len(creatorUserId) > 0 {
 		ownerItem.CreatorUserId = creatorUserId
-		//ownerItem.Viewers
 		ownerItem.Editors = &protos.UserGroupList{
 			UserIds: []string{creatorUserId},
 		}