almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-06 13:01:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make event.object_type no longer a user-facing property

Browse source
This commit is contained in:
Andrew Dickinson 2020-04-25 21:43:58 -04:00
parent 62785f1fbc
commit 8bd2686211
2 changed files with 102 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ihatemoney/history.py
View file

@ -69,11 +69,10 @@ def get_history(project, human_readable_names=True):
history = [] history = []
for version_list in [person_query.all(), project_query.all(), bill_query.all()]: for version_list in [person_query.all(), project_query.all(), bill_query.all()]:
for version in version_list: for version in version_list:
object_type = { object_type = parent_class(type(version)).__name__
"Person": _("Participant"),
"Bill": _("Bill"), # The history.html template can only handle objects of these types
"Project": _("Project"), assert object_type in ["Person", "Bill", "Project"]
}[parent_class(type(version)).__name__]
# Use the old name if applicable # Use the old name if applicable
if version.previous: if version.previous:

133
ihatemoney/templates/history.html
View file

@ -31,12 +31,11 @@
{% macro em_surround(text) %}<em class="font-italic">{{ text }}</em>{% endmacro %} {% macro em_surround(text) %}<em class="font-italic">{{ text }}</em>{% endmacro %}
{% macro simple_property_change(event, localized_property_name, from=True) %} {% macro bill_property_change(event, localized_property_name, from=True) %}
{% if from %} {% if from %}
{{ {{
_("{object_type} {object_description}: {property_name} changed from {value_before} to {value_after}").format( _("Bill {bill_description}: {property_name} changed from {value_before} to {value_after}").format(
object_type=event.object_type, bill_description=em_surround(event.object_desc),
object_description=em_surround(event.object_desc),
property_name=localized_property_name, property_name=localized_property_name,
value_before=em_surround(event.val_before), value_before=em_surround(event.val_before),
value_after=em_surround(event.val_after) value_after=em_surround(event.val_after)
@ -44,9 +43,8 @@
}} }}
{% else %} {% else %}
{{ {{
_("{object_type} {object_description}: {property_name} changed to {value_after}").format( _("Bill {bill_description}: {property_name} changed to {value_after}").format(
object_type=event.object_type, bill_description=em_surround(event.object_desc),
object_description=em_surround(event.object_desc),
property_name=localized_property_name, property_name=localized_property_name,
value_after=em_surround(event.val_after) value_after=em_surround(event.val_after)
) )
@ -101,17 +99,15 @@
{% macro owers_changed(event, add) %} {% macro owers_changed(event, add) %}
{% if add %} {% if add %}
{{ {{
_("{object_type} {object_description}: added {owers_list_str} to owers list").format( _("Bill {bill_description}: added {owers_list_str} to owers list").format(
object_type=event.object_type, bill_description=em_surround(event.object_desc),
object_description=em_surround(event.object_desc),
owers_list_str=event.val_after|localize_list|safe owers_list_str=event.val_after|localize_list|safe
) )
}} }}
{% else %} {% else %}
{{ {{
_("{object_type} {object_description}: removed {owers_list_str} from owers list").format( _("Bill {bill_description}: removed {owers_list_str} from owers list").format(
object_type=event.object_type, bill_description=em_surround(event.object_desc),
object_description=em_surround(event.object_desc),
owers_list_str=event.val_after|localize_list|safe owers_list_str=event.val_after|localize_list|safe
) )
}} }}
@ -213,13 +209,24 @@
</div> </div>
<div class="history_text"> <div class="history_text">
{% if event.operation_type == OperationType.INSERT %} {% if event.operation_type == OperationType.INSERT %}
{{ _("{object_type} {object_description} added").format( {% if event.object_type == "Project" %}
object_type=event.object_type, {{ _("Project {project_name} added").format(
object_description=em_surround(event.object_desc) project_name=em_surround(event.object_desc)
) )
}} }}
{% elif event.object_type == "Bill" %}
{{ _("Bill {bill_description} added").format(
bill_description=em_surround(event.object_desc)
)
}}
{% elif event.object_type == "Person" %}
{{ _("Participant {participant_name} added").format(
participant_name=em_surround(event.object_desc)
)
}}
{% endif %}
{% elif event.operation_type == OperationType.UPDATE %} {% elif event.operation_type == OperationType.UPDATE %}
{% if event.object_type == _("Project") %} {% if event.object_type == "Project" %}
{% if event.prop_changed == "password" %} {% if event.prop_changed == "password" %}
{{ _("Project private code changed") }} {{ _("Project private code changed") }}
{% elif event.prop_changed == "logging_preference" %} {% elif event.prop_changed == "logging_preference" %}
@ -239,31 +246,38 @@
{% endif %} {% endif %}
{% elif event.prop_changed == "activated" %} {% elif event.prop_changed == "activated" %}
{% if event.val_after == False %} {% if event.val_after == False %}
{{ _("{object_type} {object_description} deactivated").format( {{ _("Participant {participant_name} deactivated").format(
object_type=event.object_type, participant_name=em_surround(event.object_desc)
object_description=em_surround(event.object_desc)
) )
}} }}
{% else %} {% else %}
{{ _("{object_type} {object_description} reactivated").format( {{ _("Participant {participant_name} reactivated").format(
object_type=event.object_type, participant_name=em_surround(event.object_desc)
object_description=em_surround(event.object_desc)
) )
}} }}
{% endif %} {% endif %}
{% elif event.prop_changed == "name" or event.prop_changed == "what" %} {% elif event.prop_changed == "name" %}
{{ _("{object_type} {object_description} renamed to {new_name}").format( {{ _("Participant {participant_name} renamed to {new_name}").format(
object_type=event.object_type, participant_name=em_surround(event.object_desc),
object_description=em_surround(event.object_desc),
new_name=em_surround(event.val_after) new_name=em_surround(event.val_after)
) )
}} }}
{% elif event.prop_changed == "what" %}
{{ _("Bill {old_description} renamed to {new_description}").format(
old_description=em_surround(event.object_desc),
new_description=em_surround(event.val_after)
)
}}
{% elif event.prop_changed == "weight" %} {% elif event.prop_changed == "weight" %}
{{ simple_property_change(event, _("weight")) }} {{ _("Participant {participant_name}: weight changed from {old_weight} to {new_weight}").format(
participant_name=em_surround(event.object_desc),
old_weight=em_surround(event.val_before),
new_weight=em_surround(event.val_after)
)
}}
{% elif event.prop_changed == "external_link" %} {% elif event.prop_changed == "external_link" %}
{{ _("{object_type} {object_description}: external link changed to {new_link}").format( {{ _("Bill {bill_description}: external link changed to {new_link}").format(
object_type=event.object_type, bill_description=em_surround(event.object_desc),
object_description=em_surround(event.object_desc),
new_link='<a href="{0}" class="font-italic">{0}</a>'.format(event.val_after|escape)|safe new_link='<a href="{0}" class="font-italic">{0}</a>'.format(event.val_after|escape)|safe
) )
}} }}
@ -272,31 +286,64 @@
{% elif event.prop_changed == "owers_removed" %} {% elif event.prop_changed == "owers_removed" %}
{{ owers_changed(event, False)}} {{ owers_changed(event, False)}}
{% elif event.prop_changed == "payer" %} {% elif event.prop_changed == "payer" %}
{{ simple_property_change(event, _("payer"))}} {{ bill_property_change(event, _("payer"))}}
{% elif event.prop_changed == "amount" %} {% elif event.prop_changed == "amount" %}
{{ simple_property_change(event, _("amount")) }} {{ bill_property_change(event, _("amount")) }}
{% elif event.prop_changed == "date" %} {% elif event.prop_changed == "date" %}
{{ simple_property_change(event, _("date")) }} {{ bill_property_change(event, _("date")) }}
{% else %} {% else %}
{{ _("{object_type} {object_description} modified").format( {% if event.object_type == "Project" %}
object_type=event.object_type, {{ _("Project {project_name} modified").format(
object_description=em_surround(event.object_desc) project_name=em_surround(event.object_desc)
)
}}
{% elif event.object_type == "Bill" %}
{{ _("Bill {bill_description} modfied").format(
bill_description=em_surround(event.object_desc)
)
}}
{% elif event.object_type == "Person" %}
{{ _("Participant {particpant_name} modified").format(
particpant_name=em_surround(event.object_desc)
) )
}} }}
{% endif %} {% endif %}
{% endif %}
{% elif event.operation_type == OperationType.DELETE %} {% elif event.operation_type == OperationType.DELETE %}
{{ _("{object_type} {object_description} removed").format( {% if event.object_type == "Project" %}
object_type=event.object_type, {{ _("Project {project_name} removed").format(
object_description=em_surround(event.object_desc) project_name=em_surround(event.object_desc)
) )
}} }}
{% elif event.object_type == "Bill" %}
{{ _("Bill {bill_description} removed").format(
bill_description=em_surround(event.object_desc)
)
}}
{% elif event.object_type == "Person" %}
{{ _("Participant {participant_name} removed").format(
participant_name=em_surround(event.object_desc)
)
}}
{% endif %}
{% else %} {% else %}
{# Should be unreachable #} {# Should be unreachable #}
{{ _("{object_type} {object_description} changed in an unknown way").format( {% if event.object_type == "Project" %}
object_type=event.object_type, {{ _("Project {project_name} changed in an unknown way").format(
object_description=em_surround(event.object_desc) project_name=em_surround(event.object_desc)
) )
}} }}
{% elif event.object_type == "Bill" %}
{{ _("Bill {bill_description} changed in an unknown way").format(
bill_description=em_surround(event.object_desc)
)
}}
{% elif event.object_type == "Person" %}
{{ _("Participant {participant_name} changed in an unknown way").format(
participant_name=em_surround(event.object_desc)
)
}}
{% endif %}
{% endif %} {% endif %}
</div> </div>
</td> </td>