rerouted AuthBackend, changed bootstrap colors

This commit is contained in:
Arthur Gerbaud
2016-08-17 20:20:06 +02:00
parent 7694c4ea7a
commit 6e9a76696e
16 changed files with 259 additions and 227 deletions

View File

@@ -22,12 +22,4 @@ class Observation(Note):
def note_bg_colors(self): return ("info", "info")
class Signalement(Note):
source = models.CharField('Source', max_length=128)
def note_labels(self): return [self.source]
def note_bg_colors(self): return ('warning', 'alert')

View File

@@ -2,7 +2,7 @@
{% if maraude.est_terminee %}
{% include "compte_rendu/compterendu.html" %}
{% else %}
{% if user.is_superuser %}<a class="btn btn-primary" href="{% url 'maraudes:create' maraude.pk %}">Écrire le compte-rendu</a>
{% if perms.maraudes.can_add_compterendu %}<a class="btn btn-primary" href="{% url 'maraudes:create' maraude.pk %}">Écrire le compte-rendu</a>
{% else %} <p class="alert alert-info">Le compte-rendu n'a pas encore été écrit</p>{% endif %}
{% endif %}
</div>

View File

@@ -14,7 +14,7 @@
<div class="btn-group" role="group">
{% if maraude.est_terminee %}
<a href="{% url 'maraudes:details' maraude.id %}" class="btn btn-primary">
{% elif user.is_superuser %}
{% elif perms.maraudes.can_add_compterendu %}
<a href="{% url 'maraudes:create' maraude.id %}" class="btn btn-warning">
{% else %}
<a href="#" class="btn btn-default disabled">

View File

@@ -29,7 +29,7 @@ webpage = website.webpage(
app_menu=["maraudes/menu_dernieres_maraudes.html", "maraudes/menu_administration.html"]
)
from django.core.mail import send_mail
class DerniereMaraudeMixin(object):
count = 5
@@ -83,7 +83,7 @@ class IndexView(DerniereMaraudeMixin, generic.TemplateView):
## MARAUDES
@webpage
class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
model = Maraude
model = CompteRendu
context_object_name = "maraude"
template_name = "maraudes/details.html"
@@ -102,8 +102,8 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
@webpage
class MaraudeListView(DerniereMaraudeMixin, generic.ListView):
model = Maraude
template_name = "maraudes/list.html"
model = CompteRendu
template_name = "maraudes/liste.html"
paginate_by = 10
class PageInfo:
@@ -120,7 +120,7 @@ class MaraudeListView(DerniereMaraudeMixin, generic.ListView):
## COMPTE-RENDU DE MARAUDE
@webpage
class CompteRenduCreateView(generic.DetailView):
model = Maraude
model = CompteRendu
template_name = "compte_rendu/compterendu_create.html"
context_object_name = "maraude"
@@ -145,12 +145,25 @@ class CompteRenduCreateView(generic.DetailView):
)
def finalize(self):
print('finalize !')
maraude = self.get_object()
maraude.heure_fin = timezone.now()
maraude.save()
#TODO: send email to all Maraudeurs
# Redirect to a new view to edit mail ??
# Add text to some mails ? Transmission, message à un référent, etc...
# Send mail to Maraudeurs
_from = maraude.referent.email
exclude = (maraude.referent, maraude.binome)
recipients = []
for m in Maraudeur.objects.all():
if not m in exclude:
recipients.append(m.email)
objet = "Compte-rendu de maraude : %s" % maraude.date
message = "Sujets rencontrés : ..." #TODO: Mail content
send_mail(objet, message, _from, recipients)
return redirect("maraudes:details",
pk=self.get_object().pk
pk=maraude.pk
)
def post(self, request, *args, **kwargs):