taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix unintended template filter name overriding

remotes/origin/3.4.0rc
Miguel Gonzalez 2018-07-12 19:25:48 +02:00
parent 59b5646322
commit 8ca22009df
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
taiga/front/templatetags/functions.py
View File

@ -16,7 +16,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from datetime import datetime import datetime as dt
from django_jinja import library from django_jinja import library
from django_sites import get_by_id as get_site_by_id from django_sites import get_by_id as get_site_by_id
@ -34,7 +34,7 @@ def resolve(type, *args):
return url_tmpl.format(scheme=scheme, domain=site.domain, url=url) return url_tmpl.format(scheme=scheme, domain=site.domain, url=url)
@library.filter(name="date") @library.filter(name="parse_and_format_date")
def format_date(value, *args): def parse_and_format_date(value, *args):
date_value = datetime.strptime(value, '%Y-%m-%d') date_value = dt.datetime.strptime(value, '%Y-%m-%d')
return date_value.strftime('%d %b %Y') return date_value.strftime('%d %b %Y')

6
taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
View File

@ -149,7 +149,7 @@
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
{# ASSIGNED TO #} {# DUE DATE #}
{% elif field_name == "due_date" %} {% elif field_name == "due_date" %}
<tr> <tr>
<td valign="middle" rowspan="2" class="update-row-name"> <td valign="middle" rowspan="2" class="update-row-name">
@ -158,7 +158,7 @@
<td valign="top" class="update-row-from"> <td valign="top" class="update-row-from">
{% if values.0 != None and values.0 != "" %} {% if values.0 != None and values.0 != "" %}
<span>{{ _("from") }}</span><br> <span>{{ _("from") }}</span><br>
<strong>{{ values.0|date }}</strong> <strong>{{ values.0|parse_and_format_date }}</strong>
{% else %} {% else %}
<span>{{ _("from") }}</span><br> <span>{{ _("from") }}</span><br>
<strong>{{ _("Not set") }}</strong> <strong>{{ _("Not set") }}</strong>
@ -169,7 +169,7 @@
<td valign="top"> <td valign="top">
{% if values.1 != None and values.1 != "" %} {% if values.1 != None and values.1 != "" %}
<span>{{ _("to") }}</span><br> <span>{{ _("to") }}</span><br>
<strong>{{ values.1|date }}</strong> <strong>{{ values.1|parse_and_format_date }}</strong>
{% else %} {% else %}
<span>{{ _("to") }}</span><br> <span>{{ _("to") }}</span><br>
<strong>{{ _("Not set") }}</strong> <strong>{{ _("Not set") }}</strong>