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.

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

More work on Device > Facility page + Setup Wizard + misc fixes #7027

Merged

Conversation

jonboiser
Copy link
Contributor

  1. Adds WIP facility import/discovery backends on the Setup Wizard
  2. Integrates Device > Facility Page to existing KDP Sync Backend
  3. Various fixes

jonboiser added 27 commits May 20, 2020 14:39
…ration

# Conflicts:
#	kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
…ration

# Conflicts:
#	kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@jonboiser jonboiser added this to the 0.14.0 milestone Jun 10, 2020
@jonboiser jonboiser changed the base branch from develop to release-v0.14.x June 10, 2020 21:36
@jonboiser jonboiser changed the title Peer sync ui integration More work on Device > Facility page + Setup Wizard + misc fixes Jun 10, 2020
@codecov
Copy link

codecov bot commented Jun 10, 2020

@jonboiser jonboiser merged commit b428c0c into learningequality:release-v0.14.x Jun 11, 2020
@jonboiser jonboiser deleted the peer-sync-ui-integration branch June 11, 2020 02:09
"""

def retrieve(self, request, pk=None):
base_url = "http://192.168.1.8:8000/"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using a hardcoded ip is correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this endpoint is still being worked on. It will use the DynamicNetworkLocation model's baseurl field to construct the /api/public/v1/facility endpoint for a specific peer.

This hardcoded URL is just my second computer's IP on the LAN, which I'm using for testing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants