0001-wcs-fix-card-cell-reverse-relations-60891.patch

Lauréline Guérin, 21 janvier 2022 09:37

Voir les différences: en ligne côte à côte

Subject: [PATCH] wcs: fix card cell reverse relations (#60891)

 combo/apps/wcs/models.py |  3 ++
 tests/test_wcs.py        | 79 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)

             def get_relation(relations, varname, reverse):
                 for relation in relations:
                     if relation['reverse'] == reverse and relation['varname'] == varname:
                         if reverse and relation['obj'][8:] != self.card_slug:
                             # if reverse, it's the last part; check it's the correct card model
                             continue
                         return relation
             def follow_data(card_data, relations, varname, parts):

                 'fields': {},
             },
         ],
         'card_f': [
             {'id': 41, 'fields': {'cardh_raw': 42}},
         ],
         'card_g': [
             {'id': 43, 'fields': {'cardh_raw': 44}},
         ],
         'card_h': [
             {'id': 42, 'fields': {}},
             {'id': 44, 'fields': {}},
         ],
+    }
     WCS_CARDS_CUSTOM_VIEW_DATA = [
-...
                 {'obj': 'carddef:card_d', 'varname': 'carde-foo', 'type': 'item', 'reverse': True},
             ],
         },
         'card_f': {
             'name': 'Card F',
             'fields': [
                 {'label': 'Card H', 'varname': 'cardh', 'type': 'item'},
             ],
             'relations': [
                 {'obj': 'carddef:card_h', 'varname': 'cardh', 'type': 'item', 'reverse': False},
             ],
         },
         'card_g': {
             'name': 'Card G',
             'fields': [
                 {'label': 'Card H', 'varname': 'cardh', 'type': 'item'},
             ],
             'relations': [
                 {'obj': 'carddef:card_h', 'varname': 'cardh', 'type': 'item', 'reverse': False},
             ],
         },
         'card_h': {
             'name': 'Card H',
             'fields': [],
             'relations': [
                 {'obj': 'carddef:card_f', 'varname': 'cardh', 'type': 'item', 'reverse': True},
                 {'obj': 'carddef:card_g', 'varname': 'cardh', 'type': 'item', 'reverse': True},
             ],
         },
+    }
-...
         def multiple(urls):
             resp = app.get(page.get_online_url())
             assert len(resp.context['cells']) >= 3
             assert len(resp.context['cells']) >= 2
             assert resp.context['cells'][0].pk == cell.pk
             extra_ctx = re.findall(r'data-extra-context="(.*)"', resp.text)
             for i in range(0, len(resp.context['cells']) - 1):
-...
+            ]
+        )
         # reverse relation with many models using the same varname
         cell.carddef_reference = 'default:card_h'
         cell.slug = 'slugh'
         cell.card_ids = '42'
         cell.related_card_path = ''
         cell.save()
         cell2.carddef_reference = 'default:card_f'
         cell2.slug = 'slugf'
         cell2.card_ids = ''
         cell2.related_card_path = 'slugh/reverse:cardh'
         cell2.save()
         multiple(
             urls=[
                 # get first cell data
                 '/api/cards/card_h/42/',
                 # get list of card_f with cardf=42
                 '/api/cards/card_f/list?orig=combo&filter-cardh=42',
                 # and follow cardf reverse relation
                 ['/api/cards/card_f/41/'],
+            ]
+        )
         cell.card_ids = '44'
         cell.related_card_path = ''
         cell.save()
         cell2.carddef_reference = 'default:card_g'
         cell2.slug = 'slugg'
         cell2.card_ids = ''
         cell2.related_card_path = 'slugh/reverse:cardh'
         cell2.save()
         multiple(
             urls=[
                 # get first cell data
                 '/api/cards/card_h/44/',
                 # get list of card_g with cardf=44
                 '/api/cards/card_g/list?orig=combo&filter-cardh=44',
                 # and follow cardf reverse relation
                 ['/api/cards/card_g/43/'],
+            ]
+        )
     @mock.patch('combo.apps.wcs.utils.requests.send', side_effect=mocked_requests_send)
     def test_card_cell_render_user(mock_send, context, nocache):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-wcs-fix-card-cell-reverse-relations-60891.patch