From cf3dd5f37300cf9df2c060fcb5ef0960ac7a2ce4 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Fri, 5 Jun 2015 12:22:17 +0000 Subject: [PATCH] Fixed PHP timeout option merging bug --- orchestra/contrib/mailer/engine.py | 2 +- .../templates/admin/payments/transaction/report.html | 2 ++ scripts/services/apache_full_stack.md | 6 ------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/orchestra/contrib/mailer/engine.py b/orchestra/contrib/mailer/engine.py index da6f4dbc..76697083 100644 --- a/orchestra/contrib/mailer/engine.py +++ b/orchestra/contrib/mailer/engine.py @@ -14,7 +14,7 @@ from .models import Message def send_message(message, num=0, connection=None, bulk=100): - if num >= bulk: + if num >= bulk and connection is not None: connection.close() connection = None if connection is None: diff --git a/orchestra/contrib/payments/templates/admin/payments/transaction/report.html b/orchestra/contrib/payments/templates/admin/payments/transaction/report.html index afcc5e03..89a3ba28 100644 --- a/orchestra/contrib/payments/templates/admin/payments/transaction/report.html +++ b/orchestra/contrib/payments/templates/admin/payments/transaction/report.html @@ -30,6 +30,7 @@ ID {% trans "Bill" %} + {% trans "Account" %} {% trans "Contact" %} IBAN {% trans "Amount" %} @@ -41,6 +42,7 @@ {{ transaction.id }} {{ transaction.bill.number }} + {{ transaction.bill.account.username }} {{ transaction.bill.buyer.get_name }} {{ transaction.source.data.iban }} {{ transaction.amount }} diff --git a/scripts/services/apache_full_stack.md b/scripts/services/apache_full_stack.md index 6a477862..5cb265e8 100644 --- a/scripts/services/apache_full_stack.md +++ b/scripts/services/apache_full_stack.md @@ -37,10 +37,7 @@ The goal of this setup is having a high-performance state-of-the-art deployment a2enmod ssl #a2enmod auth_pam a2enmod proxy_fcgi - a2emmod userdir ``` - * TODO compat module - https://httpd.apache.org/docs/trunk/mod/mod_access_compat.html 3. Configure `suexec-custom` @@ -57,9 +54,6 @@ The goal of this setup is having a high-performance state-of-the-art deployment ``` - - - 5. Restart Apache ```bash service apache2 restart