Merge branch 'master' of https://github.com/biocore/qiita into fix-1951

qiita-spots · Sep 28, 2016 · 50e65f2 · 50e65f2
2 parents 9ca2437 + 8f65432
commit 50e65f2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/qiita_db/logger.py b/qiita_db/logger.py
@@ -157,7 +157,14 @@ def info(self):
                      logging_id = %s""".format(self._table)
             qdb.sql_connection.TRN.add(sql, [self.id])
 
-            return loads(qdb.sql_connection.TRN.execute_fetchlast())
+            rows = qdb.sql_connection.TRN.execute_fetchlast()
+
+            if rows:
+                results = loads(rows)
+            else:
+                results = {}
+
+            return results
 
     @property
     def msg(self):

diff --git a/qiita_db/support_files/populate_test_db.sql b/qiita_db/support_files/populate_test_db.sql
@@ -544,7 +544,8 @@ INSERT INTO qiita.message_user (message_id, email) VALUES (1, 'test@foo.bar'),(1
 
 -- Create a loggin entry
 INSERT INTO qiita.logging (time, severity_id, msg, information)
-    VALUES ('Sun Nov 22 21:29:30 2015', 2, 'Error message', '{}');
+    VALUES ('Sun Nov 22 21:29:30 2015', 2, 'Error message', NULL),
+           ('Sun Nov 22 21:29:30 2015', 2, 'Error message', '{}');
 
 -- Create some processing jobs
 INSERT INTO qiita.processing_job

diff --git a/qiita_pet/support_files/doc/source/tutorials/prepare-information-files.rst b/qiita_pet/support_files/doc/source/tutorials/prepare-information-files.rst
@@ -41,6 +41,9 @@ We support the following values: *Not applicable*, *Missing: Not collected*, *Mi
 
 For the latest definitions and explanation visit the `EBI/ENA Missing value reporting <http://www.ebi.ac.uk/ena/about/missing-values-reporting>`__.
 
+.. warning::
+   Column names in your information files cannot be named as a Postgres reserved word. For example, a column cannot be named `CONDITION`, but could instead be named `DISEASE_CONDITION`. For a full list of these reserved words, see this `link <https://www.postgresql.org/docs/9.3/static/sql-keywords-appendix.html>`__.
+
 Sample information file
 -----------------------
 

diff --git a/qiita_pet/templates/study_ajax/prep_summary.html b/qiita_pet/templates/study_ajax/prep_summary.html
@@ -24,7 +24,7 @@
     var options = {
       nodes: {
         color: '#ffffff',
-        font: '16px arial black'
+        font: '14px arial black'
       },
       layout : {
         hierarchical: {
@@ -202,7 +202,15 @@
           nodes.push({id: data.node_labels[i][0], label: data.node_labels[i][1], shape: 'box'});
         }
 
-        $("#graph-or-new-artifact-div").html("<div class='row'><div class='col-md-12'><h4><a class='btn btn-info' id='show-hide-btn' onclick='toggle_graphs();'>-</a><i> Files network</i></h4>(Click nodes for more information)</div></div><div class='row'><div class='col-md-12 graph' id='graph-network-div'></div></div>");
+        $("#graph-or-new-artifact-div").html(
+          "<div class='row'>" +
+            "<div class='col-md-12'>" +
+              "<h4><a class='btn btn-info' id='show-hide-btn' onclick='toggle_graphs();'>-</a><i> Files network</i></h4>" +
+              "<b>(Click nodes for more information)</b>" +
+            "</div>" +
+          "</div>" +
+          "<div class='row'><div class='col-md-12 graph' style='width:90%; left:20px;' id='graph-network-div'>" +
+          "</div>");
         draw_graph(nodes, edges, "graph-network-div", function(params) {
           if(params.nodes.length === 1) {
             var artifact_id = +params.nodes[0];