0001-manager-keep-cell-open-after-edit-actions-33103.patch

Frédéric Péters, 18 mai 2019 14:29

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

Subject: [PATCH] manager: keep cell open after edit actions (#33103)

 combo/apps/gallery/views.py                  |  6 ++++--
 combo/manager/static/js/combo.manager.js     |  7 +++++--
 combo/manager/templates/combo/page_view.html |  2 +-
 combo/manager/views.py                       |  5 +++--
 tests/test_manager.py                        | 10 +++++-----
 5 files changed, 18 insertions(+), 12 deletions(-)

             return super(ImageAddView, self).form_valid(form)
         def get_success_url(self):
             return reverse('combo-manager-page-view', kwargs={'pk': self.object.gallery.page.id})
             return reverse('combo-manager-page-view',
                     kwargs={'pk': self.object.gallery.page.id}) + '#cell-' + self.object.gallery.get_reference()
     image_add = ImageAddView.as_view()
-...
         form_class = ImageEditForm
         def get_success_url(self):
             return reverse('combo-manager-page-view', kwargs={'pk': self.object.gallery.page.id})
             return reverse('combo-manager-page-view',
                     kwargs={'pk': self.object.gallery.page.id}) + '#cell-' + self.object.gallery.get_reference()
     image_edit = ImageEditView.as_view()

       });
       $('div.cell').each(function(i, x) {
         $(this).attr('id', 'div-cell-'+i);
         compute_max_height($(this));
         $(this).addClass('untoggled');
         if (window.location.hash == '#' + $(this).attr('id')) {
           $(this).addClass('toggled');
         } else {
           $(this).addClass('untoggled');
+        }
       });
       $('#assets-browser table tr').on('hover mouseenter', function() {
         var $img = $(this).find('img');

         <h2>{{ placeholder.name }}</h2>
         <div class="cell-list">
           {% for cell in placeholder.cells %}
           <div class="cell {{cell.class_name}}" data-cell-reference="{{ cell.get_reference }}">
           <div id="cell-{{cell.get_reference}}" class="cell {{cell.class_name}}" data-cell-reference="{{ cell.get_reference }}">
             <h3><span class="handle">⣿</span>
                     <span class="group1">
                             {{ cell.get_label }}

                 cell.order = 1
             cell.save()
             PageSnapshot.take(cell.page, request=self.request, comment=_('added cell "%s"') % cell)
             return reverse('combo-manager-page-view', kwargs={'pk': page_pk})
             return reverse('combo-manager-page-view', kwargs={'pk': page_pk}) + '#cell-' + cell.get_reference()
     page_add_cell = PageAddCellView.as_view()
-...
             return self.object.get_default_form_class()
         def get_success_url(self):
             return reverse('combo-manager-page-view', kwargs={'pk': self.kwargs.get('page_pk')})
             return reverse('combo-manager-page-view', kwargs={'pk': self.kwargs.get('page_pk')}
                     ) + '#cell-' + self.object.get_reference()
         def form_valid(self, form):
             if self.request.is_ajax():

         resp = app.get('/manage/pages/%s/' % page.id)
         # click on first option link, this should add a text cell
         resp = app.get(resp.html.find('option').get('data-add-url'))
         assert resp.location.endswith('/manage/pages/1/')
         cells = CellBase.get_cells(page_id=page.id)
         assert len(cells) == 1
         assert isinstance(cells[0], TextCell)
         assert resp.location.endswith('/manage/pages/1/#cell-%s' % cells[0].get_reference())
         resp = app.get('/manage/pages/%s/' % page.id)
         assert ('data-cell-reference="%s"' % cells[0].get_reference()) in resp.text
         resp.forms[0]['c%s-text' % cells[0].get_reference()].value = 'Hello world'
         resp = resp.forms[0].submit()
         assert resp.status_int == 302
         assert resp.location.endswith('/manage/pages/1/')
         assert resp.location.endswith('/manage/pages/1/#cell-%s' % cells[0].get_reference())
         resp = app.get('/manage/pages/%s/' % page.id)
         assert resp.forms[0]['c%s-text' % cells[0].get_reference()].value == 'Hello world'
-...
         resp = app.get('/manage/pages/%s/' % page.id)
         data_add_url = [x for x in resp.html.find_all('option') if x.text == 'Text'][0].get('data-add-url')
         resp = app.get(data_add_url)
         assert resp.location.endswith('/manage/pages/%s/' % page.id)
         cells = CellBase.get_cells(page_id=page.id)
         assert len(cells) == 1
         assert isinstance(cells[0], TextCell)
         assert resp.location.endswith('/manage/pages/%s/#cell-%s' % (page.id, cells[0].get_reference()))
         resp = app.get('/manage/pages/%s/' % page.id)
         resp.form['cdata_textcell-%s-text' % cells[0].id].value = 'Hello : World'
-...
             assert 'Foobar' in options
             data_add_url = [x for x in resp.html.find_all('option') if x.text == 'Foobar'][0].get('data-add-url')
             resp = app.get(data_add_url)
             assert resp.location.endswith('/manage/pages/%s/' % page.id)
             cells = CellBase.get_cells(page_id=page.id)
             assert len(cells) == 1
             assert isinstance(cells[0], ConfigJsonCell)
             assert cells[0].key == 'test-config-json-cell'
             assert resp.location.endswith('/manage/pages/%s/#cell-%s' % (page.id, cells[0].get_reference()))
             resp = app.get('/manage/pages/%s/' % page.id)
             assert ('data-cell-reference="%s"' % cells[0].get_reference()) in resp.text
-...
             resp.form['c%s-test3' % cells[0].get_reference()].value = 'Hello again'
             resp = resp.form.submit()
             assert resp.status_int == 302
             assert resp.location.endswith('/manage/pages/%s/' % page.id)
             assert resp.location.endswith('/manage/pages/%s/#cell-%s' % (page.id, cells[0].get_reference()))
             resp = app.get('/manage/pages/%s/' % page.id)
             assert resp.form['c%s-test' % cells[0].get_reference()].value == 'Hello world'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-manager-keep-cell-open-after-edit-actions-33103.patch