nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 14:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standardised the URLs and enabled search function on applications

Browse Source
This commit is contained in:
Andrew Williams
2010-05-17 13:37:10 +01:00
parent e2f88027a3
commit 1b76ccc698
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hr/urls.py
View File

@@ -4,17 +4,17 @@ from hr import views
urlpatterns = patterns('',
('^$', views.index),
(r'^recommendations/$', views.view_recommendations),
(r'^recommendations/(?P<recommendationid>.*)/$', views.view_recommendation),
(r'^applications/$', views.view_applications),
(r'^applications/(?P<applicationid>\d+)/$', views.view_application),
(r'^applications/(?P<applicationid>\d+)/update/(?P<status>\d+)/$', views.update_application),
(r'^applications/(?P<applicationid>\d+)/note/$', views.add_note),
(r'^applications/(?P<applicationid>\d+)/reject/$', views.reject_application),
(r'^applications/(?P<applicationid>\d+)/accept/$', views.accept_application),
(r'^recommendation/$', views.view_recommendations),
(r'^recommendation/(?P<recommendationid>.*)/$', views.view_recommendation),
(r'^application/$', views.view_applications),
(r'^application/(?P<applicationid>\d+)/$', views.view_application),
(r'^application/(?P<applicationid>\d+)/update/(?P<status>\d+)/$', views.update_application),
(r'^application/(?P<applicationid>\d+)/note/$', views.add_note),
(r'^application/(?P<applicationid>\d+)/reject/$', views.reject_application),
(r'^application/(?P<applicationid>\d+)/accept/$', views.accept_application),
(r'^add/application/$', views.add_application),
(r'^add/recommendation/$', views.add_recommendation),
(r'^application/add/$', views.add_application),
(r'^recommendation/add/$', views.add_recommendation),
(r'^admin/applications/$', views.admin_applications),
(r'^application/admin$', views.admin_applications),
)

14
hr/views.py
View File

@@ -151,8 +151,18 @@ def admin_applications(request):
if not (request.user.is_staff or Group.objects.get(name=settings.HR_STAFF_GROUP) in request.user.groups.all()):
return HttpResponseRedirect(reverse('hr.views.index'))
view_status = [APPLICATION_STATUS_AWAITINGREVIEW, APPLICATION_STATUS_ACCEPTED, APPLICATION_STATUS_QUERY]
apps = Application.objects.filter(status__in=view_status)
if 'q' in request.GET:
query = request.GET['q']
if 'l' in request.GET:
limit = request.get['l']
else:
limit = 10
print query, limit
apps = Application.objects.filter(character__name__icontains=query)[:limit]
else:
view_status = [APPLICATION_STATUS_AWAITINGREVIEW, APPLICATION_STATUS_ACCEPTED, APPLICATION_STATUS_QUERY]
apps = Application.objects.filter(status__in=view_status)
return render_to_response('hr/applications/admin/view_list.html', locals(), context_instance=RequestContext(request))
@login_required