Skip to content

Multi-org: format base path, not including protocol #7260

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

Merged
eradman merged 1 commit into from
Dec 18, 2025
+6 −3
Merged

Multi-org: format base path, not including protocol #7260

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
2 changes: 1 addition & 1 deletion redash/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 5 additions & 2 deletions tests/models/test_alerts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -176,16 +177,18 @@ def test_render_custom_alert_template(self):
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'}]
</pre>
""" % (
alert.name,
settings.HOST,
alert.id,
settings.HOST,
alert.query_id,
)
result = alert.render_template(textwrap.dedent(custom_alert))
Expand Down
Loading