X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fmodel%2Ffolders.go;fp=lib%2Fmodel%2Ffolders.go;h=d5ea3bf899008517fbcfb31f5d09e5dcdf794e22;hb=8d3f51e52894d46a4a92a944bc09f4ceaa1abf51;hp=24ac48cec1b1926f69a0e314dd3a0e9e85479bd3;hpb=b1708565ee2b4d725bb98c6b015f16af3d2a097e;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/model/folders.go b/lib/model/folders.go
index 24ac48c..d5ea3bf 100644
--- a/lib/model/folders.go
+++ b/lib/model/folders.go
@@ -213,24 +213,23 @@ func (f *Folders) createUpdate(newF folder.FolderConfig, create bool, initial bo
 		return nil, fmt.Errorf("Unsupported folder type")
 	}
 
+	// Allocate a new UUID
+	if create {
+		newF.ID = fld.NewUID("")
+	}
+	if !create && newF.ID == "" {
+		return nil, fmt.Errorf("Cannot update folder with null ID")
+	}
+
 	// Set default value if needed
 	if newF.Status == "" {
 		newF.Status = folder.StatusDisable
 	}
 	if newF.Label == "" {
-		newF.Label = filepath.Base(newF.ClientPath) + "_" + newF.ID[0:8]
-	}
-
-	// Allocate a new UUID
-	if create {
-		i := len(newF.Label)
-		if i > 20 {
-			i = 20
+		newF.Label = filepath.Base(newF.ClientPath)
+		if len(newF.ID) > 8 {
+			newF.Label += "_" + newF.ID[0:8]
 		}
-		newF.ID = fld.NewUID(newF.Label[:i])
-	}
-	if !create && newF.ID == "" {
-		return nil, fmt.Errorf("Cannot update folder with null ID")
 	}
 
 	// Normalize path (needed for Windows path including bashlashes)