[AIRFLOW-5306] Fix the display of links when they contain special cha…

…racters (apache#5904)
Jerryguo · Sep 2, 2019 · c83ba31 · c83ba31
1 parent 1754275
commit c83ba31
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/airflow/www/templates/airflow/dag.html b/airflow/www/templates/airflow/dag.html
@@ -493,32 +493,30 @@ <h4 class="modal-title" id="dagModalLabel">
                   "&dag_id=" + encodeURIComponent(dag_id) +
                   "&execution_date=" + encodeURIComponent(execution_date) +
                   "&link_name=" + encodeURIComponent(link);
+          var external_link = $('<a href="#" data-toggle="tooltip" class="btn btn-primary disabled" target="_blank"></a>')
+          var link_tooltip = $('<span class="tool-tip" data-toggle="tooltip" style="padding-right: 2px; padding-left: 3px" data-placement="top" ' +
+            'title="link not yet available"></span>');
+          link_tooltip.append(external_link)
+          external_link.text(link);
 
-          var underscore_link = link.split(" ").join("_");
-          var a = '<span class="tool-tip" data-toggle="tooltip" style="padding-right: 2px; padding-left: 3px" data-placement="top" ' +
-                  'title="link not yet available" id="tooltip-' + underscore_link +'">' +
-                    '<a id="link-' + underscore_link +'" href="#" data-toggle="tooltip" class="btn btn-primary disabled" target="_blank">' + link + '</a>' +
-                  '</span>';
           $.ajax(
             {url: url,
              cache: false,
              success: function (data, textStatus, jqXHR) {
-               var external_link = $( "#link-" + underscore_link );
                external_link.attr('href', data['url']);
                external_link.removeClass('disabled');
-               $("#tooltip-" + underscore_link).tooltip('disable');
+               link_tooltip.tooltip('disable');
              },
              error:  function (data) {
-               var link_tooltip = $("#tooltip-" + underscore_link);
                link_tooltip.tooltip('hide').attr('title', data['responseJSON']['error']).tooltip('fixTitle');
              }
            });
 
-          markupArr.push(a)
+          markupArr.push(link_tooltip)
         });
 
         $('#extra_links').prev('hr').show();
-        $('#extra_links').append(markupArr.join('')).show();
+        $('#extra_links').append(markupArr).show();
         $('[data-toggle="tooltip"]').tooltip();
       }