Skip to content

Fix erroneous options for default slices #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mistercrunch merged 1 commit into from
Jul 11, 2016
Merged

Fix erroneous options for default slices #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions caravel/data/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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