Skip to content
Snippets Groups Projects
Commit 04926060 authored by Alexander Pace's avatar Alexander Pace
Browse files

Revert "starting user request feature" - accidenatlly branched off of non-master branch

This reverts commit f85b7c70.
parent ffbe85d2
No related branches found
No related tags found
No related merge requests found
......@@ -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"),
......
from django.contrib import admin
# Register your models here.
from django.db import models
# Create your models here.
from django.test import TestCase
# Create your tests here.
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"),
)
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))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment