[incubator-superset] branch update-annotation-model updated: rename columns

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hugh pushed a commit to branch update-annotation-model
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/update-annotation-model by this push:
     new 9e9de8e  rename columns
9e9de8e is described below

commit 9e9de8e91e59c778bac2a85f8e4fb41fdd394e0a
Author: Hugh Miles <hm...@lyft.com>
AuthorDate: Tue Aug 28 10:59:09 2018 -0700

    rename columns
---
 superset/models/annotations.py | 2 +-
 superset/views/annotations.py  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/superset/models/annotations.py b/superset/models/annotations.py
index 5f71e35..b7640ba 100644
--- a/superset/models/annotations.py
+++ b/superset/models/annotations.py
@@ -42,7 +42,7 @@ class Annotation(Model, AuditMixinNullable):
     layer = relationship(
         AnnotationLayer,
         backref='annotation')
-    annotation_metadata = Column(Text)
+    json_metadata = Column(Text)
 
     __table_args__ = (
         Index('ti_dag_state', layer_id, start_dttm, end_dttm),
diff --git a/superset/views/annotations.py b/superset/views/annotations.py
index 9e14010..6770c9d 100644
--- a/superset/views/annotations.py
+++ b/superset/views/annotations.py
@@ -26,7 +26,7 @@ class AnnotationModelView(SupersetModelView, DeleteMixin):  # noqa
                     'annotation_metadata']
     edit_columns = [
         'layer', 'short_descr', 'long_descr', 'start_dttm', 'end_dttm',
-        'annotation_metadata']
+        'json_metadata']
 
     add_columns = edit_columns
 
@@ -36,11 +36,11 @@ class AnnotationModelView(SupersetModelView, DeleteMixin):  # noqa
         'start_dttm': _('Start Dttm'),
         'end_dttm': _('End Dttm'),
         'long_descr': _('Long Descr'),
-        'annotation_metadata': _('JSON Metadata'),
+        'json_metadata': _('JSON Metadata'),
     }
 
     description_columns = {
-        'annotation_metadata': 'This JSON represents any additional metadata this \
+        'json_metadata': 'This JSON represents any additional metadata this \
          annotation needs to add more context.',
     }