From 5cf5019ff162ea4484217c496d6ed384ab626e43 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 29 Sep 2015 22:13:29 -0700 Subject: [PATCH] Done fixing form continuity --- panoramix/forms.py | 1 + panoramix/viz.py | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/panoramix/forms.py b/panoramix/forms.py index e347b80fe1cf2..1cc3b12134377 100644 --- a/panoramix/forms.py +++ b/panoramix/forms.py @@ -52,6 +52,7 @@ def __init__(self, viz): description="One or many metrics to display"), 'metric': SelectField( 'Metric', choices=datasource.metrics_combo, + default='', description="One or many metrics to display"), 'groupby': SelectMultipleField( 'Group by', diff --git a/panoramix/viz.py b/panoramix/viz.py index 99b664e5b1f5f..499305997d3ad 100644 --- a/panoramix/viz.py +++ b/panoramix/viz.py @@ -27,8 +27,10 @@ class BaseViz(object): css_files = [] def __init__(self, datasource, form_data): + self.orig_form_data = form_data self.datasource = datasource self.request = request + self.viz_type = form_data.get("viz_type") ff = FormFactory(self) form_class = ff.get_form() @@ -39,7 +41,7 @@ def __init__(self, datasource, form_data): form = form_class(**form_data) data = form.data.copy() previous_viz_type = form_data.get('previous_viz_type') - if previous_viz_type in viz_types: + if previous_viz_type in viz_types and previous_viz_type != self.viz_type: data = { k: form.data[k] for k in form_data.keys() @@ -47,19 +49,13 @@ def __init__(self, datasource, form_data): defaults.update(data) self.form_data = defaults - self.form_data['previous_viz_type'] = form_data.get("viz_type") + self.form_data['previous_viz_type'] = self.viz_type self.token = self.form_data.get( 'token', 'token_' + uuid.uuid4().hex[:8]) - as_list = ('metrics', 'groupby') - for k, v in self.form_data.items(): - if k in as_list and not isinstance(v, list): - self.form_data[k] = [v] - elif k not in as_list and isinstance(v, list) and v: - self.form_data[k] = v[0] - self.metrics = self.form_data.get('metrics') or [] self.groupby = self.form_data.get('groupby') or [] + self.reassignments() @classmethod def flat_form_fields(cls): @@ -71,6 +67,9 @@ def flat_form_fields(cls): l.append(obj) return l + def reassignments(self): + pass + def get_url(self, **kwargs): d = self.form_data.copy() if 'action' in d: @@ -311,12 +310,19 @@ class BigNumberViz(BaseViz): #('rolling_type', 'rolling_periods'), ] + def reassignments(self): + metric = self.form_data.get('metric') + if not metric: + self.form_data['metric'] = self.orig_form_data.get('metrics') + + def query_obj(self): d = super(BigNumberViz, self).query_obj() metric = self.form_data.get('metric') if not metric: raise Exception("Pick a metric!") d['metrics'] = [self.form_data.get('metric')] + self.form_data['metric'] = metric return d def get_json(self):