summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorSteve Manuel <nilslice@gmail.com>2018-01-04 11:14:16 -0700
committerGitHub <noreply@github.com>2018-01-04 11:14:16 -0700
commit7194ae217d76436003ec03dab368c273ce3f2b5f (patch)
tree4cacef475a1515244b97fe91cfe09bdf5c19abc0 /system
parent188c1350b123d570bb55f348b19f583ef0e6f4b1 (diff)
[deps] update go.uuid to latest and include in vendor (#217)
* Fix UUID issues (#216) * fixing errors due to new updates to uuid packakge * fix fomatting * updating vendored version of uuid package * adding test for more content types
Diffstat (limited to 'system')
-rw-r--r--system/db/content.go6
-rw-r--r--system/db/upload.go7
2 files changed, 11 insertions, 2 deletions
diff --git a/system/db/content.go b/system/db/content.go
index e73d803..b96852e 100644
--- a/system/db/content.go
+++ b/system/db/content.go
@@ -203,7 +203,11 @@ func insert(ns string, data url.Values) (int, error) {
data.Set("id", cid)
// add UUID to data for use in embedded Item
- uid := uuid.NewV4()
+ uid, err := uuid.NewV4()
+ if err != nil {
+ return err
+ }
+
data.Set("uuid", uid.String())
// if type has a specifier, add it to data for downstream processing
diff --git a/system/db/upload.go b/system/db/upload.go
index beeee2d..b7171dd 100644
--- a/system/db/upload.go
+++ b/system/db/upload.go
@@ -28,8 +28,13 @@ func SetUpload(target string, data url.Values) (int, error) {
if data.Get("uuid") == "" ||
data.Get("uuid") == (uuid.UUID{}).String() {
+
// set new UUID for upload
- data.Set("uuid", uuid.NewV4().String())
+ uid, err := uuid.NewV4()
+ if err != nil {
+ return 0, err
+ }
+ data.Set("uuid", uid.String())
}
if data.Get("slug") == "" {