Merge pull request #558 from spadgett/cli-extension-download

Merged by openshift-bot

Author: OpenShift Bot

app/views/command-line.html

@@ -24,7 +24,11 @@ <h1 id="cli">Command Line Tools</h1>
                     <div ng-if="cliDownloadURLPresent">
                       <label class="cli-download-label">Download <code>oc</code>:</label>
                       <div ng-repeat="(key, value) in cliDownloadURL">
-                        <a href="{{value}}" class="cli-download-link">
+                        <!--
+                           Use target="_self" so that the Angular router doesn't rewrite the link when the download is served using an extension.
+                           See https://docs.angularjs.org/guide/$location#html-link-rewriting
+                        -->
+                        <a ng-href="{{value}}" class="cli-download-link" target="_self">
                           {{key}}
                           <i class="fa fa-external-link"></i>
                         </a>

dist/scripts/templates.js

@@ -3583,7 +3583,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div ng-if=\"cliDownloadURLPresent\">\n" +
     "<label class=\"cli-download-label\">Download <code>oc</code>:</label>\n" +
     "<div ng-repeat=\"(key, value) in cliDownloadURL\">\n" +
-    "<a href=\"{{value}}\" class=\"cli-download-link\">\n" +
+    "\n" +
+    "<a ng-href=\"{{value}}\" class=\"cli-download-link\" target=\"_self\">\n" +
     "{{key}}\n" +
     "<i class=\"fa fa-external-link\"></i>\n" +
     "</a>\n" +