Skip to content

GitLab

Commit 029beefe authored by stef's avatar stef
Browse files

[enh] added query for existing cases

parent 5aacf45e
Hide whitespace changes
Inline Side-by-side
bt/views.py
View file @ 029beefe
from forms import AddViolation
from forms import AddViolation, SearchViolation
from django.http import HttpResponse, HttpResponseRedirect, Http404
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
......@@ -18,6 +18,7 @@ from email.mime.text import MIMEText
from email.header import Header
from urlparse import urljoin
from BeautifulSoup import BeautifulSoup, Comment as BComment
from operator import itemgetter
def sanitizeHtml(value, base_url=None):
rjs = r'[\s]*(&#x.{1,7})?'.join(list('javascript:'))
......@@ -48,16 +49,18 @@ def activate(request):
try:
v=Violation.objects.get(activationid=request.GET.get('key','asdf'))
except:
return HttpResponse(_("Thank you, this has been already activated"))
return HttpResponse(_('Thank you, this key has been already activated' % v.id))
if v:
actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
to=[x.email for x in User.objects.filter(groups__name='moderator')]
msg = MIMEText("A new report was submitted. To approve click here: %s/moderate/?key=%s\n" % (settings.ROOT_URL or 'http://localhost:8001/', actid), _charset="utf-8")
details='\n'.join(["%s: %s" % (k.capitalize(), val) for k,val in v.__dict__.items() if not k.startswith('_') and val])
msg = MIMEText("A new report was submitted. To approve click here: %s/moderate/?key=%s\n\nDetails follow:\n%s\n%s" %
(settings.ROOT_URL or 'http://localhost:8001/', actid, details, v.comment_set.get().comment), _charset="utf-8")
msg['Subject'] = 'NNMon submission approval'.encode("Utf-8")
msg['From'] = 'nnmon@nnmon.lqdn.fr'
msg['From'] = 'nnmon@respectmynet.eu'
msg['To'] = ', '.join(to)
s = smtplib.SMTP('localhost')
s.sendmail('nnmon@nnmon.lqdn.fr', to, msg.as_string())
s.sendmail('nnmon@respectmynet.eu', to, msg.as_string())
s.quit()
v.activationid=actid
v.save()
......@@ -68,19 +71,27 @@ def moderate(request):
try:
v=Violation.objects.get(activationid=request.GET.get('key','asdf'))
except:
return HttpResponse(_("Thank you, this has been already activated"))
return HttpResponse(_('Thank you, this key has been already activated'))
if not v:
messages.add_message(request, messages.INFO, _('No such key'))
return HttpResponseRedirect('/') # Redirect after POST
if request.GET.get('action','')=='approve':
messages.add_message(request, messages.INFO, _('Thank you for approving the <a href="/view/%s">submission</a>.' % v.id))
msg = MIMEText(_("Your report has been approved.\nTo see it, please visit: %s/view/%s") % (settings.ROOT_URL or 'http://localhost:8001/', v.id), _charset="utf-8")
msg['Subject'] = Header(_('NNMon submission approved').encode("Utf-8"), 'utf-8')
msg['From'] = 'nnmon@respectmynet.eu'
msg['To'] = v.comment_set.get().submitter_email
s = smtplib.SMTP('localhost')
s.sendmail('nnmon@respectmynet.eu', [msg['To']], msg.as_string())
s.quit()
if settings.TWITTER_API:
try:
settings.TWITTER_API.PostUpdate(_("New infringement reported for %s (%s) %s") % (v.operator, v.country, v.contract))
settings.TWITTER_API.PostUpdate(_("New case reported for %s (%s) %s %s/view/%s") % (v.operator, v.country, v.contract, settings.ROOT_URL or 'http://localhost:8001/', v.id))
except:
pass
v.activationid=''
v.save()
messages.add_message(request, messages.INFO, _('Thank you for approving the submission.'))
return HttpResponseRedirect('/') # Redirect after POST
if request.GET.get('action','')=='delete':
v.delete()
......@@ -111,10 +122,10 @@ def sendverifymail(service,to):
actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
msg = MIMEText(_("Thank you for submitting a new report. To finalize your submission please confirm using your validation key.\nYour verification key is %s/%s%s\nPlease note that reports are moderated, it might take some time before your report appears online. Thank you for your patience.") % (settings.ROOT_URL or 'http://localhost:8001/', service, actid), _charset="utf-8")
msg['Subject'] = Header(_('NNMon submission verification').encode("Utf-8"), 'utf-8')
msg['From'] = 'nnmon@nnmon.lqdn.fr'
msg['From'] = 'nnmon@respectmynet.eu'
msg['To'] = Header(to.encode("Utf-8"), 'utf-8')
s = smtplib.SMTP('localhost')
s.sendmail('nnmon@nnmon.lqdn.fr', [to], msg.as_string())
s.sendmail('nnmon@respectmynet.eu', [to], msg.as_string())
s.quit()
return actid
......@@ -194,3 +205,20 @@ def view(request,id):
if v.activationid:
raise Http404
return render_to_response('view.html', { 'v': v, },context_instance=RequestContext(request))
def lookup(request):
if request.method == 'GET':
form = SearchViolation(request.GET)
print 'asdf'
if form.is_valid():
print 'valid asdf'
v=Violation.objects.filter(
country = form.cleaned_data['country'],
operator = form.cleaned_data['operator'],
contract = form.cleaned_data['contract'],
media = form.cleaned_data['media'],
activationid = ''
)
res=json.dumps(sorted([(x.id,x.resource_name) for x in v],reverse=True))
return HttpResponse(res)
return HttpResponse('')
media/js/form.js
View file @ 029beefe
......@@ -3,12 +3,32 @@ function empty(node) {
return true;
}
function check1st4() {
if($('#id_country').val() && $('#id_operator').val() && $('#id_contract').val() && $('#id_media').val() ) {
$('#id_comment').parent().parent().show();
var country=$('#id_country').val();
var op=$('#id_operator').val();
var contract=$('#id_contract').val();
var media=$('#id_media').val();
var div=$('#similar_cases');
if(country && op && contract && media) {
//http://localhost:8001/lookup/?country=HU&contract=asdf&operator=Voda&media=fixed
$.getJSON('/lookup/?country='+country+'&contract='+contract+'&operator='+op+'&media='+media, function(data) {
if (data.length>0) {
div.parent().removeClass('hidden');
} else {
div.parent().addClass('hidden');
}
while(data) {
var val=data.pop();
div.append('<li><a href="/view/'+val[0]+'">'+(val[1] || "no resource given")+'</a></li>');
};
});
$('#id_comment').parent().parent().show().focus();
$('#id_comment_ifr').focus();
$('#id_email').parent().parent().show();
$('#id_nick').parent().parent().show();
$('#id_attachments0').parent().parent().show();
$("#save_button").attr('disabled','true').show();
} else {
div.parent().addClass('hidden');
}
}
function init_form() {
......
templates/index.html
View file @ 029beefe
......@@ -33,6 +33,7 @@ $(document).ready(function(){
init_form();
{% if not form.is_bound %}
$(".fieldWrapper").hide();
$("#id_resource_name").parent().parent().show();
$("#id_country").parent().parent().show();
$("#id_operator").parent().parent().show();
$("#id_contract").parent().parent().show();
......@@ -50,7 +51,6 @@ $(document).ready(function(){
$("#show_optionals").show();
}
{% endif %}
$("#sortedlist").tablesorter();
$('.confirm_form').submit(function() {
var self=this;
$.ajax({url: '/confirm/'+$(this).attr('id')+'/'+$(this).children('input:first').attr('value'), success: function(data) { $(self).html(data); }});
......@@ -63,7 +63,8 @@ $(document).ready(function(){
theme : "advanced",
theme_advanced_toolbar_align : "left",
theme_advanced_toolbar_location : "top",
theme_advanced_buttons1 : "bold,italic,underline,bullist,numlist,outdent,indent,blockquote,undo,",
//theme_advanced_buttons1 : "bold,italic,underline,bullist,numlist,outdent,indent,blockquote,undo,",
theme_advanced_buttons1 : "",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
plugins : "paste",
......@@ -93,7 +94,7 @@ $(document).ready(function(){
{% if messages %}
<ul class="messages">
{% for message in messages %}
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message|safe }}</li>
{% endfor %}
</ul>
{% endif %}
......@@ -101,6 +102,7 @@ $(document).ready(function(){
<h2>{% trans "Add New Case" %}</h2>
<form name="addForm" enctype="multipart/form-data" action="{% root_url %}/add/" method="post">
{% for field in form %}
{% if field.html_name = 'comment' %}<div class="hidden errorlist">{% trans "There are already some reports for this Operator/Contract, please check if yours is already among them:" %}<ul id="similar_cases"></ul></div>{%endif%}
{% if field.html_name = 'resource' %}<div id="show_optionals">{% trans "Provide optional details" %}</div><div id="optional">{%endif%}
<div class="fieldWrapper">
{% if field.help_text %}<span class="help_text">{{ field.help_text }}</span>{% endif %}
......
urls.py
View file @ 029beefe
......@@ -20,6 +20,7 @@ urlpatterns = patterns('',
(r'^confirm/(?P<id>[0-9a-z]*)$', bt.confirm),
(r'^confirm/(?P<id>[0-9]*)/(?P<name>.*)$', bt.confirm),
(r'^moderate/$', bt.moderate),
(r'^lookup/$', bt.lookup),
(r'^accounts/logout$', 'django.contrib.auth.views.logout', {'next_page' : '/'}),
(r'^accounts/', include('registration.urls')),
(r'^comments/', include('django.contrib.comments.urls')),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment