2 files changed, 72 insertions, 9 deletions
diff --git a/system/addon/addon.go b/system/addon/addon.go
index a423d07..833ce23 100644
--- a/system/addon/addon.go
+++ b/system/addon/addon.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/ponzu-cms/ponzu/system/db"
 	"github.com/ponzu-cms/ponzu/system/item"
+	"github.com/tidwall/sjson"
 )
 
 var (
@@ -65,8 +66,7 @@ func Register(m Meta, fn func() interface{}) Addon {
 
 // register sets up the system to use the Addon by:
 // 1. Validating the Addon struct
-// 2. Checking that the Addon parent type was added to Types (via its New())
-// 3. Saving it to the __addons bucket in DB with id/key = addon_reverse_dns
+// 2. Saving it to the __addons bucket in DB with id/key = addon_reverse_dns
 func register(a Addon) error {
 	if a.PonzuAddonName == "" {
 		return fmt.Errorf(`Addon must have valid Meta struct embedded: missing %s field.`, "PonzuAddonName")
@@ -118,7 +118,12 @@ func register(a Addon) error {
 
 	// db.SetAddon is like SetContent, but rather than the key being an int64 ID,
 	// we need it to be a string based on the addon_reverse_dns
-	err = db.SetAddon(vals)
+	kind, ok := Types[a.PonzuAddonReverseDNS]
+	if !ok {
+		return fmt.Errorf("Error: no addon to set with id: %s", a.PonzuAddonReverseDNS)
+	}
+
+	err = db.SetAddon(vals, kind())
 	if err != nil {
 		return err
 	}
@@ -163,9 +168,41 @@ func setStatus(key, status string) error {
 		return err
 	}
 
-	a.Set("addon_status", status)
+	a, err = sjson.SetBytes(a, "addon_status", status)
+	if err != nil {
+		return err
+	}
+
+	kind, ok := Types[key]
+	if !ok {
+		return fmt.Errorf("Error: no addon to set with id: %s", key)
+	}
+
+	// convert json => map[string]interface{} => url.Values
+	var kv map[string]interface{}
+	err = json.Unmarshal(a, kv)
+	if err != nil {
+		return err
+	}
+
+	var vals url.Values
+	for k, v := range kv {
+		switch v.(type) {
+		case []string:
+			s := v.([]string)
+			for i := range s {
+				if i == 0 {
+					vals.Set(k, s[i])
+				}
+
+				vals.Add(k, s[i])
+			}
+		default:
+			vals.Set(k, fmt.Sprintf("%v", v))
+		}
+	}
 
-	err = db.SetAddon(a)
+	err = db.SetAddon(vals, kind())
 	if err != nil {
 		return err
 	}
diff --git a/system/addon/manager.go b/system/addon/manager.go
index acd779a..eb8b44c 100644
--- a/system/addon/manager.go
+++ b/system/addon/manager.go
@@ -2,12 +2,14 @@ package addon
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"html/template"
 	"net/url"
 
 	"github.com/gorilla/schema"
 	"github.com/ponzu-cms/ponzu/management/editor"
+	"github.com/tidwall/gjson"
 )
 
 const defaultInput = `<input type="hidden" name="%s" value="%s"/>`
@@ -31,18 +33,42 @@ type manager struct {
 }
 
 // Manage ...
-func Manage(data url.Values, reverseDNS string) ([]byte, error) {
+func Manage(data []byte, reverseDNS string) ([]byte, error) {
 	a, ok := Types[reverseDNS]
 	if !ok {
 		return nil, fmt.Errorf("Addon has not been added to addon.Types map")
 	}
 
+	// convert json => map[string]interface{} => url.Values
+	var kv map[string]interface{}
+	err := json.Unmarshal(data, kv)
+	if err != nil {
+		return nil, err
+	}
+
+	var vals url.Values
+	for k, v := range kv {
+		switch v.(type) {
+		case []string:
+			s := v.([]string)
+			for i := range s {
+				if i == 0 {
+					vals.Set(k, s[i])
+				}
+
+				vals.Add(k, s[i])
+			}
+		default:
+			vals.Set(k, fmt.Sprintf("%v", v))
+		}
+	}
+
 	at := a()
 
 	dec := schema.NewDecoder()
 	dec.IgnoreUnknownKeys(true)
 	dec.SetAliasTag("json")
-	err := dec.Decode(at, data)
+	err = dec.Decode(at, vals)
 	if err != nil {
 		return nil, err
 	}
@@ -68,7 +94,7 @@ func Manage(data url.Values, reverseDNS string) ([]byte, error) {
 	}
 
 	for _, f := range fields {
-		input := fmt.Sprintf(defaultInput, f, data.Get(f))
+		input := fmt.Sprintf(defaultInput, f, gjson.GetBytes(data, f).String())
 		_, err := inputs.WriteString(input)
 		if err != nil {
 			return nil, fmt.Errorf("Failed to write input for addon view: %s", f)
@@ -78,7 +104,7 @@ func Manage(data url.Values, reverseDNS string) ([]byte, error) {
 	m := manager{
 		DefaultInputs: template.HTML(inputs.Bytes()),
 		Editor:        template.HTML(v),
-		AddonName:     data.Get("addon_name"),
+		AddonName:     gjson.GetBytes(data, "addon_name").String(),
 	}
 
 	// execute html template into buffer for func return val