Compare commits

..

1 Commits

Author SHA1 Message Date
Yann Weber 071bb3203c manager: make agenda's groups foldable (#85616)
gitea/chrono/pipeline/head This commit looks good Details
2024-04-10 18:33:17 +02:00
2 changed files with 20 additions and 15 deletions

View File

@ -16,7 +16,7 @@
{% if object_list %}
{% regroup object_list by category as agenda_groups %}
{% for group in agenda_groups %}
{% with forloop.counter|stringformat:"s" as i %}
{% with group.grouper.id|stringformat:"s" as i %}
{% with 'folded-admin-forms-group-'|add:i as foldname %}
<div class="section foldable {% if user|get_preference:foldname %}folded{% endif %}" data-section-folded-pref-name="{{foldname}}">
{% endwith %}

View File

@ -103,6 +103,8 @@ def test_inspect_category(app, admin_user):
def test_category_fold_preferences(app, admin_user):
category1 = Category.objects.create(label='Foo bar')
category2 = Category.objects.create(label='Toto')
pref_name1 = f'folded-admin-forms-group-{category1.id}'
pref_name2 = f'folded-admin-forms-group-{category2.id}'
Agenda.objects.create(label='Foo bar', category=category1)
agenda2 = Agenda.objects.create(label='Titi', category=category2)
@ -111,62 +113,65 @@ def test_category_fold_preferences(app, admin_user):
resp = app.get('/manage/')
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-1]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name1}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' not in elt[0].classes
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-2]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name2}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' not in elt[0].classes
user_prefs = UserPreferences.objects.get(user=admin_user)
user_prefs.update_preference('folded-admin-forms-group-1', True)
user_prefs.update_preference(pref_name1, True)
resp = app.get('/manage/')
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-1]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name1}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' in elt[0].classes
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-2]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name2}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' not in elt[0].classes
# Order is preserved when adding a new category : preferences are preserved
category_temp = Category.objects.create(label='Tata0')
category3 = Category.objects.create(label='Tata')
pref_name3 = f'folded-admin-forms-group-{category3.id}'
category_temp.delete()
Agenda.objects.create(label='Titi', category=category3)
user_prefs.update_preference('folded-admin-forms-group-1', False)
user_prefs.update_preference('folded-admin-forms-group-2', True)
user_prefs.update_preference(pref_name1, False)
user_prefs.update_preference(pref_name2, True)
resp = app.get('/manage/')
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-1]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name1}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' not in elt[0].classes
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-2]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name2}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' in elt[0].classes
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-3]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name3}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' not in elt[0].classes
# Preferences are "shifted" when a category is deleted
# Preferences are not "shifted" when a category is deleted
agenda2.delete()
resp = app.get('/manage/')
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-1]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name1}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' not in elt[0].classes
elt = resp.pyquery.find('div[data-section-folded-pref-name=folded-admin-forms-group-2]')
elt = resp.pyquery.find(f'div[data-section-folded-pref-name={pref_name3}]')
assert len(elt) == 1
assert 'foldable' in elt[0].classes
assert 'folded' in elt[0].classes
assert 'folded' not in elt[0].classes