From 9a63c4e2f59c0e18d43fda3c13eb73ae1d92067c Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 27 May 2019 17:16:55 -0400
Subject: [PATCH] Fixes for JobParameters Vue components.

Based on comments from @inkuzmin use scoped styling and fix notes conditional logic.
---
 .../components/JobParameters/JobParameters.vue    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/client/galaxy/scripts/components/JobParameters/JobParameters.vue b/client/galaxy/scripts/components/JobParameters/JobParameters.vue
index fc9a94b6f0d..0d63d32773c 100644
--- a/client/galaxy/scripts/components/JobParameters/JobParameters.vue
+++ b/client/galaxy/scripts/components/JobParameters/JobParameters.vue
@@ -22,9 +22,7 @@
                                         {{ elVal.hid }}: {{ elVal.name }}
                                     </a>
                                 </span>
-                                <span v-else>
-                                    {{ elVal.hid }}: {{ elVal.name }}
-                                </span>
+                                <span v-else> {{ elVal.hid }}: {{ elVal.name }} </span>
                             </li>
                         </ul>
                     </td>
@@ -88,7 +86,7 @@ export default {
         anyNotes: function() {
             let hasNotes = false;
             this.parameters.forEach(parameter => {
-                hasNotes = hasNotes && parameter.note;
+                hasNotes = hasNotes || parameter.notes;
             });
             return hasNotes;
         }
@@ -100,9 +98,10 @@ export default {
         ajaxCall: function(url) {
             axios
                 .get(url)
-                .then(response => {
-                    this.hasParameterErrors = response.data.has_parameter_errors;
-                    this.parameters = response.data.parameters;
+                .then(response => response.data)
+                .then(data => {
+                    this.hasParameterErrors = data.has_parameter_errors;
+                    this.parameters = data.parameters;
                 })
                 .catch(e => {
                     console.error(e);
@@ -111,7 +110,7 @@ export default {
     }
 };
 </script>
-<style>
+<style scoped>
 table.info_data_table {
     table-layout: fixed;
     word-break: break-word;