Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add link to check server connection to error page for api discovery #907

Merged
merged 1 commit into from
Nov 21, 2016
Merged

Add link to check server connection to error page for api discovery #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/scripts/controllers/util/error.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,21 @@ angular.module('openshiftConsole')
case 'invalid_request':
$scope.errorMessage = "Invalid request";
break;
case 'API_DISCOVERY':
$scope.errorLinks = [{
href: window.location.protocol + "//" + window.OPENSHIFT_CONFIG.api.openshift.hostPort + window.OPENSHIFT_CONFIG.api.openshift.prefix,
label: "Check Server Connection",
target: "_blank"
}];
break;
default:
$scope.errorMessage = "An error has occurred";
}

if (params.error_description) {
$scope.errorDetails = params.error_description;
}

$scope.reloadConsole = function() {
$window.location.href = "/";
};
Expand Down
4 changes: 4 additions & 0 deletions app/views/util/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
<h1>Error</h1>
<h4>{{errorMessage}}</h4>
<div>{{errorDetails}}</div>
<div ng-if="errorLinks.length">
<a ng-repeat-start="link in errorLinks" ng-href="{{link.href}}" target="{{link.target || '_blank'}}">{{link.label}}</a>
<span ng-repeat-end ng-if="!$last" class="action-divider mar-right-xs">|</span>
</div>
<br>
<div>Return to the <a href="" ng-click="reloadConsole()">console</a>.</div>
</div>
Expand Down
8 changes: 8 additions & 0 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7841,6 +7841,14 @@ case "invalid_request":
a.errorMessage = "Invalid request";
break;

case "API_DISCOVERY":
a.errorLinks = [ {
href:window.location.protocol + "//" + window.OPENSHIFT_CONFIG.api.openshift.hostPort + window.OPENSHIFT_CONFIG.api.openshift.prefix,
label:"Check Server Connection",
target:"_blank"
} ];
break;

default:
a.errorMessage = "An error has occurred";
}
Expand Down
4 changes: 4 additions & 0 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11485,6 +11485,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<h1>Error</h1>\n" +
"<h4>{{errorMessage}}</h4>\n" +
"<div>{{errorDetails}}</div>\n" +
"<div ng-if=\"errorLinks.length\">\n" +
"<a ng-repeat-start=\"link in errorLinks\" ng-href=\"{{link.href}}\" target=\"{{link.target || '_blank'}}\">{{link.label}}</a>\n" +
"<span ng-repeat-end ng-if=\"!$last\" class=\"action-divider mar-right-xs\">|</span>\n" +
"</div>\n" +
"<br>\n" +
"<div>Return to the <a href=\"\" ng-click=\"reloadConsole()\">console</a>.</div>\n" +
"</div>\n" +
Expand Down