Skip to content

Commit

Permalink
Fix erroneous options for default slices (#730)
Browse files Browse the repository at this point in the history
  • Loading branch information
georgeke authored and mistercrunch committed Jul 11, 2016
1 parent 979782d commit 00970d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions caravel/data/__init__.py
Expand Up @@ -285,7 +285,7 @@ def load_world_bank_health_n_pop():
metric="sum__SP_RUR_TOTL_ZS",
num_period_compare="10")),
Slice(
slice_name="Life Expexctancy VS Rural %",
slice_name="Life Expectancy VS Rural %",
viz_type='bubble',
datasource_type='table',
table=tbl,
Expand Down Expand Up @@ -368,7 +368,7 @@ def load_world_bank_health_n_pop():
'sum__SP_RUR_TOTL_ZS',
'sum__SH_DYN_AIDS'],
secondary_metric='sum__SP_POP_TOTL',
series=["country_name"],)),
series="country_name",)),
]
for slc in slices:
merge_slice(slc)
Expand Down Expand Up @@ -1068,6 +1068,7 @@ def load_multiformat_time_series_data():
dttm_and_expr = dttm_and_expr_dict[col.column_name]
col.python_date_format = dttm_and_expr[0]
col.dbatabase_expr = dttm_and_expr[1]
col.is_dttm = True
db.session.merge(obj)
db.session.commit()
obj.fetch_metadata()
Expand Down
2 changes: 1 addition & 1 deletion caravel/forms.py
Expand Up @@ -551,7 +551,7 @@ def __init__(self, viz):
"default": default_groupby,
"description": _(
"Defines the grouping of entities. "
"Each serie is shown as a specific color on the chart and "
"Each series is shown as a specific color on the chart and "
"has a legend toggle")
}),
'entity': (SelectField, {
Expand Down

0 comments on commit 00970d6

Please sign in to comment.