From 04926060c7ebf951fbdb3f148b34cfc2ce10d1ac Mon Sep 17 00:00:00 2001 From: Alexander Pace <alexander.pace@ligo.org> Date: Tue, 6 Dec 2016 15:09:10 -0600 Subject: [PATCH] Revert "starting user request feature" - accidenatlly branched off of non-master branch This reverts commit f85b7c7016dcbb8bff6b9b88c9b64970975da4c9. --- urls.py | 1 - userrequest/__init__.py | 0 userrequest/admin.py | 3 --- userrequest/migrations/__init__.py | 0 userrequest/models.py | 3 --- userrequest/tests.py | 3 --- userrequest/urls.py | 9 -------- userrequest/views.py | 34 ------------------------------ 8 files changed, 53 deletions(-) delete mode 100644 userrequest/__init__.py delete mode 100644 userrequest/admin.py delete mode 100644 userrequest/migrations/__init__.py delete mode 100644 userrequest/models.py delete mode 100644 userrequest/tests.py delete mode 100644 userrequest/urls.py delete mode 100644 userrequest/views.py diff --git a/urls.py b/urls.py index 76362b0b1..8e778ad62 100644 --- a/urls.py +++ b/urls.py @@ -26,7 +26,6 @@ urlpatterns = patterns('', (r'^apiweb/', include('gracedb.urls_rest', app_name="api", namespace="shib")), (r'^apibasic/', include('gracedb.urls_rest', app_name="api", namespace="basic")), (r'^options/', include('userprofile.urls')), - (r'^request/', include('userrequest.urls')), (r'^feeds/(?P<url>.*)/$', EventFeed()), url (r'^feeds/$', feedview, name="feeds"), diff --git a/userrequest/__init__.py b/userrequest/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/userrequest/admin.py b/userrequest/admin.py deleted file mode 100644 index 8c38f3f3d..000000000 --- a/userrequest/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/userrequest/migrations/__init__.py b/userrequest/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/userrequest/models.py b/userrequest/models.py deleted file mode 100644 index 71a836239..000000000 --- a/userrequest/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/userrequest/tests.py b/userrequest/tests.py deleted file mode 100644 index 7ce503c2d..000000000 --- a/userrequest/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/userrequest/urls.py b/userrequest/urls.py deleted file mode 100644 index 6b7b01bfe..000000000 --- a/userrequest/urls.py +++ /dev/null @@ -1,9 +0,0 @@ - -from django.conf.urls import patterns, url - -urlpatterns = patterns('userrequest.views', - url (r'^$', 'index', name="userrequest-home"), - - #url (r'^robotcert/create$', 'createRequest', name="userrequest-create-request"), - -) diff --git a/userrequest/views.py b/userrequest/views.py deleted file mode 100644 index a73eca705..000000000 --- a/userrequest/views.py +++ /dev/null @@ -1,34 +0,0 @@ - -from django.http import HttpResponse -from django.http import HttpResponseRedirect, HttpResponseNotFound -from django.http import Http404, HttpResponseForbidden -from django.http import HttpResponseBadRequest - -from django.core.urlresolvers import reverse -from django.contrib.auth.models import User -from django.template import RequestContext -from django.shortcuts import render_to_response - -from userprofile.models import Trigger, Contact - -from userprofile.forms import ContactForm, triggerFormFactory - -from gracedb.permission_utils import internal_user_required, lvem_user_required - -from django.utils import timezone - -from gracedb.query import labelQuery -from gracedb.models import Label -from django.db.models import Q - -# Let's let everybody onto the index view. -#@internal_user_required -def index(request): - triggers = Trigger.objects.filter(user=request.user) - contacts = Contact.objects.filter(user=request.user) - d = { 'triggers' : triggers, 'contacts': contacts } - return render_to_response('profile/notifications.html', - d, - context_instance=RequestContext(request)) - - -- GitLab