From d4761d9b12b8c552f9d6fe6c17f8db3b6894ba90 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Thu, 11 Feb 2016 16:19:17 +0100
Subject: also include jingle group name in JingleListEntry


diff --git a/rddb/rddb.go b/rddb/rddb.go
index b2fedf4..e17f3fb 100644
--- a/rddb/rddb.go
+++ b/rddb/rddb.go
@@ -149,6 +149,7 @@ type getShowCartListRequest struct {
 }
 
 type JingleListEntry struct {
+	Group        string
 	Description  string
 	ActiveCart   int
 	InactiveCart int
@@ -468,15 +469,15 @@ func (db *DB) getJingleList(username string) (result getJingleListResult) {
 	result.jingles = make(map[string]JingleListEntry)
 	for rows.Next() {
 		var jingle JingleListEntry
-		var name, params string
+		var params string
 
-		if result.err = rows.Scan(&name, &params, &jingle.ActiveCart, &jingle.InactiveCart, &jingle.Description); result.err != nil {
+		if result.err = rows.Scan(&jingle.Group, &params, &jingle.ActiveCart, &jingle.InactiveCart, &jingle.Description); result.err != nil {
 			return
 		}
 		if params[0] != 'J' {
 			continue
 		}
-		result.jingles[name] = jingle
+		result.jingles[jingle.Group] = jingle
 	}
 	result.err = rows.Err()
 	return
-- 
cgit v0.10.2