Skip to content

Commit

Permalink
Merge branch 'release/0.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Oct 14, 2019
2 parents b561cd8 + c89d662 commit 4ceea70
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions config/auth_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

import importlib

from django.conf.urls import include, url
from django.conf.urls import include
from django.urls import path

from allauth.account.views import login, logout, SignupView
from allauth.socialaccount import providers
from allauth.socialaccount import views as social_views

providers_urlpatterns = []
providers_urlpatterns = [] # type: ignore

for provider in providers.registry.get_list():
prov_mod = importlib.import_module(provider.get_package() + '.urls')
Expand Down
2 changes: 2 additions & 0 deletions locuszoom_plotting_service/gwas/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# We may want to re-enable this in the future, but for now this is a powerful action and we will delete it
admin.site.disable_action('delete_selected')


# Add custom UI: view analysis info objects, ingest status, maybe a default sort order
class AnalysisInfoAdmin(admin.ModelAdmin):
list_display = ['created', 'owner', 'label', 'ingest_status']
Expand All @@ -41,4 +42,5 @@ def has_delete_permission(self, request, obj=None):
# requests)
return False


admin.site.register(AnalysisInfo, AnalysisInfoAdmin)
3 changes: 0 additions & 3 deletions locuszoom_plotting_service/gwas/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.db import transaction
from django.shortcuts import get_object_or_404
from django.urls import reverse, reverse_lazy
from django.views.generic import (
Expand All @@ -29,8 +28,6 @@
HttpResponseRedirect,
)

from locuszoom_plotting_service.taskapp import tasks

from . import forms as lz_forms
from . import models as lz_models
from . import permissions as lz_permissions
Expand Down

0 comments on commit 4ceea70

Please sign in to comment.