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

Anticipate a sane path environment on central server #5618

Merged
merged 1 commit into from
Nov 14, 2019
Merged

Anticipate a sane path environment on central server #5618

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 kalite/control_panel/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def data_export(request):

if settings.CENTRAL_SERVER:
# TODO(dylanjbarth and benjaoming): this looks awful
from central.models import Organization
from centralserver.central.models import Organization
all_zones_url = reverse("api_dispatch_list", kwargs={"resource_name": "zone"})
if zone_id:
org = Zone.objects.get(id=zone_id).get_org()
Expand Down
2 changes: 1 addition & 1 deletion kalite/packages/bundled/securesync/devices/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def register_public_key_server(request):
# at least they can proceed directly.
if request.user.organization_set.count() == 0:
# Localizing central-only import
from central.models import Organization
from centralserver.central.models import Organization
org = Organization(name="Your organization", owner=request.user)
org.save()
org.add_member(request.user)
Expand Down