diff --git a/urls.py b/urls.py index 8e778ad623bf2a2bf51848911f6b0a26f85babc3..76362b0b1a68d97fa4a93eab332af9c5b76d3f7e 100644 --- a/urls.py +++ b/urls.py @@ -26,6 +26,7 @@ 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 new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/userrequest/admin.py b/userrequest/admin.py new file mode 100644 index 0000000000000000000000000000000000000000..8c38f3f3dad51e4585f3984282c2a4bec5349c1e --- /dev/null +++ b/userrequest/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/userrequest/migrations/__init__.py b/userrequest/migrations/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/userrequest/models.py b/userrequest/models.py new file mode 100644 index 0000000000000000000000000000000000000000..71a836239075aa6e6e4ecb700e9c42c95c022d91 --- /dev/null +++ b/userrequest/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/userrequest/tests.py b/userrequest/tests.py new file mode 100644 index 0000000000000000000000000000000000000000..7ce503c2dd97ba78597f6ff6e4393132753573f6 --- /dev/null +++ b/userrequest/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/userrequest/urls.py b/userrequest/urls.py new file mode 100644 index 0000000000000000000000000000000000000000..6b7b01bfedf49c13b20f504bba36e2fe8cf5faae --- /dev/null +++ b/userrequest/urls.py @@ -0,0 +1,9 @@ + +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 new file mode 100644 index 0000000000000000000000000000000000000000..a73eca705ff049315490b18960b987c7cd396cb0 --- /dev/null +++ b/userrequest/views.py @@ -0,0 +1,34 @@ + +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)) + +