Fixing a bug

apache · Jan 19, 2016 · 5f88068 · 5f88068
1 parent 5f9f95b
commit 5f88068
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/panoramix/models.py b/panoramix/models.py
@@ -173,7 +173,10 @@ def url(self):
 
     @property
     def metadata_dejson(self):
-        return json.loads(self.json_metadata)
+        if self.json_metadata:
+            return json.loads(self.json_metadata)
+        else:
+            return {}
 
     def dashboard_link(self):
         return '<a href="{self.url}">{self.dashboard_title}</a>'.format(self=self)

diff --git a/panoramix/static/widgets/viz_iframe.js b/panoramix/static/widgets/viz_iframe.js
@@ -4,9 +4,11 @@ px.registerViz('iframe', function(slice) {
       $('#code').attr('rows', '15')
       $.getJSON(slice.jsonEndpoint(), function(payload) {
         slice.container.html(
-          '<iframe style="width:100%; height:100%;"></iframe>');
+          '<iframe style="width:100%;"></iframe>');
         console.log(slice);
-        slice.container.find('iframe').attr('src', payload.form_data.url);
+        iframe = slice.container.find('iframe');
+        iframe.css('height', slice.height());
+        iframe.attr('src', payload.form_data.url);
         slice.done();
       })
       .fail(function(xhr) {