diff --git a/redash/utils/__init__.py b/redash/utils/__init__.py index 914a47dd6..bd9e0af08 100644 --- a/redash/utils/__init__.py +++ b/redash/utils/__init__.py @@ -211,7 +211,7 @@ def collect_parameters_from_request(args): def base_url(org): if settings.MULTI_ORG: - return "https://{}/{}".format(settings.HOST, org.slug) + return "{}/{}".format(settings.HOST, org.slug) return settings.HOST diff --git a/tests/models/test_alerts.py b/tests/models/test_alerts.py index d0816d6ee..fbd82dcce 100644 --- a/tests/models/test_alerts.py +++ b/tests/models/test_alerts.py @@ -1,6 +1,7 @@ import textwrap from unittest import TestCase +from redash import settings from redash.models import OPERATORS, Alert, db, next_state from tests import BaseTestCase @@ -176,16 +177,18 @@ class TestAlertRenderTemplate(BaseTestCase): ALERT_CONDITION equals ALERT_THRESHOLD 5 ALERT_NAME %s - ALERT_URL https:///default/alerts/%d + ALERT_URL %s/default/alerts/%d QUERY_NAME Query - QUERY_URL https:///default/queries/%d + QUERY_URL %s/default/queries/%d QUERY_RESULT_VALUE 1 QUERY_RESULT_ROWS [{'foo': 1}] QUERY_RESULT_COLS [{'name': 'foo', 'type': 'STRING'}] """ % ( alert.name, + settings.HOST, alert.id, + settings.HOST, alert.query_id, ) result = alert.render_template(textwrap.dedent(custom_alert))