From 80bd6d19db4f153b8aad0ad52c468e3906ea2fb8 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Feb 12 2018 13:13:41 +0000 Subject: Link directly to API key settings in error message This makes it easier for users whose API keys have expired to find the correct place to generate a new one. --- diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py index a5fb764..dc7e1b9 100644 --- a/pagure/api/__init__.py +++ b/pagure/api/__init__.py @@ -23,6 +23,7 @@ import docutils import enum import flask import markupsafe +from six.moves.urllib_parse import urljoin API = flask.Blueprint('api_ns', __name__, url_prefix='/api/0') @@ -67,7 +68,8 @@ class APIERROR(enum.Enum): 'action from reaching completion' EINVALIDREQ = 'Invalid or incomplete input submitted' EINVALIDTOK = 'Invalid or expired token. Please visit %s to get or '\ - 'renew your API token.' % pagure_config['APP_URL'] + 'renew your API token.'\ + % urljoin(pagure_config['APP_URL'], 'settings#api-keys') ENOISSUE = 'Issue not found' EISSUENOTALLOWED = 'You are not allowed to view this issue' EPULLREQUESTSDISABLED = 'Pull-Request have been deactivated for this '\ diff --git a/pagure/templates/user_settings.html b/pagure/templates/user_settings.html index bd973f0..bde2cf9 100644 --- a/pagure/templates/user_settings.html +++ b/pagure/templates/user_settings.html @@ -161,7 +161,7 @@
-
+
API Keys