diff --git a/website/templates/issue.html b/website/templates/issue.html index c1cb34108f..ad170822f6 100644 --- a/website/templates/issue.html +++ b/website/templates/issue.html @@ -178,7 +178,7 @@

OCR Results:

{% endif %}

+ {% csrf_token %}

diff --git a/website/templates/issue_edit.html b/website/templates/issue_edit.html index 6c745c7738..b7c96e46dc 100644 --- a/website/templates/issue_edit.html +++ b/website/templates/issue_edit.html @@ -16,7 +16,6 @@ {% endblock %} {% block content %} -

diff --git a/website/templates/search.html b/website/templates/search.html new file mode 100644 index 0000000000..0a94aaed88 --- /dev/null +++ b/website/templates/search.html @@ -0,0 +1,69 @@ +{% extends "base.html" %} +{% load gravatar %} +{% load staticfiles %} +{% load humanize %} + +{% block content %} +

Search for Bugs & Issues

+ +

+ + + + +

+ +

+ {% if query %} + {% if issues %} + {% for issue in issues %} +

+ + {{ issue.comments.all|length }} comments + + + {% if issue.user.socialaccount_set.all.0.get_avatar_url %} +

+ {% else %} +

+ {% endif %} + +

+ +

+ + {{ issue.description|truncatechars:100 }} + {% if issue.status == "open" %} + {{issue.status}} + {% else %} + {{issue.status}} + {% endif %} +

+ + {{ issue.user }} + + found a bug on {{ issue.domain_title }} {{ issue.timestamp|timesince }} ago | + {{ issue.domain_name }} + {{issue.get_label_display}} +

+ {% if issue.screenshot %} + +

+ + {% endif %} +

+ {% endfor %} + {% else %} +

Nothing Found!

+ {% endif %} + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/website/views.py b/website/views.py index b0b96b31a3..bf8fd31433 100644 --- a/website/views.py +++ b/website/views.py @@ -19,7 +19,7 @@ from website.models import Issue, Points, Hunt, Domain, InviteFriend from django.core.files import File from django.core.urlresolvers import reverse, reverse_lazy -from django.db.models import Sum, Count +from django.db.models import Sum, Count, Q from django.core.urlresolvers import reverse from django.core.files.storage import default_storage from django.views.generic import View @@ -88,7 +88,6 @@ def find_key(request, token): class IssueBaseCreate(object): - def form_valid(self, form): score = 3 obj = form.save(commit=False) @@ -109,7 +108,6 @@ def process_issue(self, user, obj, created, domain, score=3): action.send(user, verb='found a bug on website', target=obj) messages.success(self.request, 'Bug added! +'+ str(score)) - if created: try: email_to = get_email_from_domain(domain) @@ -164,7 +162,6 @@ def process_issue(self, user, obj, created, domain, score=3): return HttpResponseRedirect("/") - class IssueCreate(IssueBaseCreate, CreateView): model = Issue fields = ['url','description','screenshot','domain', 'label'] @@ -391,6 +388,15 @@ def get_context_data(self, *args, **kwargs): context['scoreboard'] = Domain.objects.all().order_by('-modified') return context +def search(request, template="search.html"): + query = request.GET.get('query') + if query is None: + return render_to_response(template, context_instance=RequestContext(request)) + context = { + 'query' : query, + 'issues' : Issue.objects.filter(Q(description__icontains=query)) + } + return render_to_response(template, context, context_instance=RequestContext(request)) class HuntCreate(CreateView): model = Hunt @@ -483,7 +489,6 @@ def get_context_data(self, *args, **kwargs): context['emails'] = get_email_from_domain(self.kwargs['slug']) return context - def get_email_from_domain(domain_name): new_urls = deque(['http://'+domain_name]) processed_urls = set() @@ -610,7 +615,6 @@ def assign_issue_to_user(request, user, **kwargs): assigner.request = request assigner.process_issue(user, issue, created, domain) - class CreateInviteFriend(CreateView): template_name = 'invite_friend.html' model = InviteFriend @@ -647,4 +651,3 @@ def form_valid(self, form): messages.success(self.request, 'An email has been sent to your friend. Keep inviting your friends and get points!') return HttpResponseRedirect(self.success_url) - From a0c04df611db4d4e4f2a8ff17774ceae39d2465f Mon Sep 17 00:00:00 2001 From: Raghav Jajodia Date: Sat, 8 Jul 2017 20:27:07 +0530 Subject: [PATCH 2/2] Add search-domain and search-user function --- website/templates/search.html | 31 ++++++++++++++++++++++++++++++- website/views.py | 24 ++++++++++++++++++++---- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/website/templates/search.html b/website/templates/search.html index 0a94aaed88..50d5bb3256 100644 --- a/website/templates/search.html +++ b/website/templates/search.html @@ -6,12 +6,17 @@ {% block content %}

Search for Bugs & Issues

{% endfor %} + {% elif domains %} +

+ {% for domain in domains %} +

+ +

+ {{ domain.name }} + +

+ {% endfor %} +

+ {% elif users %} +

+ {% for user in users %} +

+ {% if user.socialaccount_set.all.0.get_avatar_url %} +

+ {% else %} +

+ {% endif %} + {{user.username}} +

+ {% endfor %} +

{% else %}

Nothing Found!

{% endif %} diff --git a/website/views.py b/website/views.py index bf8fd31433..d240d918b5 100644 --- a/website/views.py +++ b/website/views.py @@ -390,12 +390,28 @@ def get_context_data(self, *args, **kwargs): def search(request, template="search.html"): query = request.GET.get('query') + stype = request.GET.get('type') if query is None: return render_to_response(template, context_instance=RequestContext(request)) - context = { - 'query' : query, - 'issues' : Issue.objects.filter(Q(description__icontains=query)) - } + + if stype == "issue": + context = { + 'query' : query, + 'type' : stype, + 'issues' : Issue.objects.filter(Q(description__icontains=query)) + } + elif stype == "domain": + context = { + 'query' : query, + 'type' : stype, + 'domains' : Domain.objects.filter(Q(url__icontains=query)) + } + elif stype == "user": + context = { + 'query' : query, + 'type' : stype, + 'users' : User.objects.filter(Q(username__icontains=query)) + } return render_to_response(template, context, context_instance=RequestContext(request)) class HuntCreate(CreateView):