From 26a984955b9a01175bd2ebfd8280f8d475bbebbb Mon Sep 17 00:00:00 2001
From: David Schoonover <dsc@wikimedia.org>
Date: Wed, 23 May 2012 15:50:08 -0700
Subject: [PATCH] Turns out sub-forms don't contribute their fields to a parent form when calling jQuery.serializeArray(), which is AWESOME. And fixes the 'extraneous random crap' problem with serializing Metric models in some cases.

---
 lib/chart/chart-type.co         |   34 ----------------------------------
 lib/template/data.jade          |    2 +-
 lib/template/dataset.jade       |    2 +-
 lib/template/datasource-ui.jade |    2 +-
 lib/template/datasource.jade    |    2 +-
 lib/util/underscore/index.co    |    2 +-
 6 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 lib/template/metric.jade

diff --git a/lib/chart/chart-type.co b/lib/chart/chart-type.co
index aea28cd..4da37a1 100644
--- a/lib/chart/chart-type.co
+++ b/lib/chart/chart-type.co
@@ -379,37 +379,3 @@ class exports.ChartType extends ReadyEmitter
     
     ### }}}
 
-
-
-
-# 
-# /**
-#  * @class Specification for an option.
-#  */
-# class exports.ChartOption
-#     SPEC_KEYS : <[ name type default desc tags examples ]>
-#     
-#     name     : null
-#     type     : 'String'
-#     default  : null
-#     desc     : ''
-#     tags     : null
-#     examples : null
-#     
-#     
-#     (@spec) ->
-#         throw new Error('Each ChartOption requires a name!') unless @spec.name
-#         
-#         for k of @SPEC_KEYS
-#             v = @spec[k]
-#             @[k] = v if v?
-#         @tags or= []
-#     
-#     isDefault: (v) ->
-#         # @default is v
-#         _.isEqual @default, v
-#     
-#     toString: -> "(#{@name}: #{@type})"
-# 
-# 
-# 
diff --git a/lib/template/data.jade b/lib/template/data.jade
index cd827c9..da0afd8 100644
--- a/lib/template/data.jade
+++ b/lib/template/data.jade
@@ -1,4 +1,4 @@
-section.data-ui
+section.data-ui: form.data-ui-form
     .metric_edit_view_pane(data-subview="MetricEditView")
     .data_set_view_pane(data-subview="DataSetView")
 
diff --git a/lib/template/dataset.jade b/lib/template/dataset.jade
index 94e5db0..349b8ee 100644
--- a/lib/template/dataset.jade
+++ b/lib/template/dataset.jade
@@ -1,4 +1,4 @@
-section.dataset-ui.dataset: div.inner
+section.dataset-ui.dataset: div.inner: form.dataset-ui-form
     h4 Graph Data Set
     
     .dataset-buttons
diff --git a/lib/template/datasource-ui.jade b/lib/template/datasource-ui.jade
index a934936..67a660e 100644
--- a/lib/template/datasource-ui.jade
+++ b/lib/template/datasource-ui.jade
@@ -1,4 +1,4 @@
-section.datasource-ui(class="datasource-ui-#{cid}")
+section.datasource-ui(class="datasource-ui-#{cid}"): form.datasource-ui-form
     
     section.datasource-summary(data-toggle="collapse", data-target="##{graph_id} .datasource-ui.datasource-ui-#{cid} .datasource-selector")
         i.expand-datasource-ui-button.icon-chevron-down
diff --git a/lib/template/datasource.jade b/lib/template/datasource.jade
index 6320e72..15616bd 100644
--- a/lib/template/datasource.jade
+++ b/lib/template/datasource.jade
@@ -1,7 +1,7 @@
 - var ds = source.attributes
 - var id = ds.id || source.cid
 - var activeClass = (source_id === ds.id ? 'active' : '')
-.datasource-source.tab-pane(class="datasource-source-#{id} #{activeClass}")
+.datasource-source.tab-pane(class="datasource-source-#{id} #{activeClass}"): form.datasource-source-form
     .datasource-source-details.well
         .source-name #{ds.name}
         .source-id #{ds.id}
diff --git a/lib/template/metric.jade b/lib/template/metric.jade
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/util/underscore/index.co b/lib/util/underscore/index.co
index cc9d458..d24ced1 100644
--- a/lib/util/underscore/index.co
+++ b/lib/util/underscore/index.co
@@ -9,7 +9,7 @@ _.mixin require 'kraken/util/underscore/string'
 
 
 ## Debug
-_.dump = (o, label='dump', expanded=false) ->
+_.dump = (o, label='dump', expanded=true) ->
     if not _.isArray(o) and _.isObject(o)
         if expanded
             console.group label
-- 
1.7.0.4