0003-assets-display-assets-related-to-cell-in-popup-40223.patch

Lauréline Guérin, 16 mars 2020 11:12

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

Subject: [PATCH 3/3] assets: display assets related to cell in popup (#40223)

 .../templates/combo/manager_assets.html       | 36 +------------
 .../combo/manager_assets_fragment.html        | 35 ++++++++++++
 .../templates/combo/manager_slot_assets.html  | 19 +++++++
 combo/apps/assets/urls.py                     |  3 +-
 combo/apps/assets/views.py                    | 54 ++++++++++++++++++-
 combo/data/models.py                          |  7 ++-
 combo/manager/static/css/combo.manager.css    | 16 +++---
 .../combo/manager_edit_cell_block.html        |  1 +
 tests/test_manager.py                         | 51 ++++++++++++++++++
 9 files changed, 176 insertions(+), 46 deletions(-)
 create mode 100644 combo/apps/assets/templates/combo/manager_assets_fragment.html
 create mode 100644 combo/apps/assets/templates/combo/manager_slot_assets.html

     <div id="assets-browser">
       <div id="assets-listing">
       <table class="main">
         <thead>
           <tr>
             <th>{% trans "Name" %}</th>
             <th>{% trans "Size" %}</th>
             <th></th>
             <th></th>
           </tr>
         </thead>
         <tbody>
           {% for asset in object_list %}
           <tr class="{{ asset.css_classes }}">
             <td><a href="{{ asset.src }}">{{ asset.name }}</a></td>
             <td>{% if asset.size %}{{ asset.size|filesizeformat }}{% else %}-{% endif %}</td>
             <td class="image">{% if asset.is_image %}<img data-href="{{ asset.src }}" src="{{ asset.thumb }}"/>{% endif %}</td>
             <td class="actions">
               {% if asset.key %}{# theme asset #}
               <a href="{% url 'combo-manager-slot-asset-upload' key=asset.key %}"
                  class="overwrite" rel="popup">{% trans 'Overwrite' %}</a>
               {% if asset.asset %}
               <a href="{% url 'combo-manager-slot-asset-delete' key=asset.key %}"
                  class="delete" rel="popup">{% trans 'Delete' %}</a>
               {% endif %}
               {% else %}
               <a href="{% url 'combo-manager-asset-overwrite' %}?img={{asset.filepath|iriencode}}"
                  class="overwrite" rel="popup">{% trans 'Overwrite' %}</a>
               <a href="{% url 'combo-manager-asset-delete' %}?img={{asset.filepath|iriencode}}"
                  class="delete" rel="popup">{% trans 'Delete' %}</a>
               {% endif %}
             </td>
             </td>
           </tr>
           {% endfor %}
         </tbody>
       </table>
         {% include "combo/manager_assets_fragment.html" %}
       </div>
       <div id="asset-preview"></div>
     </div>

     {% load i18n %}
     <table class="main">
       <thead>
         <tr>
           <th>{% trans "Name" %}</th>
           <th>{% trans "Size" %}</th>
           <th></th>
           <th></th>
         </tr>
       </thead>
       <tbody>
         {% for asset in object_list %}
         <tr class="{{ asset.css_classes }}">
           <td><a href="{{ asset.src }}">{{ asset.name }}</a></td>
           <td>{% if asset.size %}{{ asset.size|filesizeformat }}{% else %}-{% endif %}</td>
           <td class="image">{% if asset.is_image %}<img data-href="{{ asset.src }}" src="{{ asset.thumb }}"/>{% endif %}</td>
           <td class="actions">
             {% if asset.key %}{# theme asset #}
             <a href="{% url 'combo-manager-slot-asset-upload' key=asset.key %}{% if cell_reference %}?cell_reference={{ cell_reference }}{% endif %}"
                class="overwrite" rel="popup">{% trans 'Overwrite' %}</a>
             {% if asset.asset %}
             <a href="{% url 'combo-manager-slot-asset-delete' key=asset.key %}{% if cell_reference %}?cell_reference={{ cell_reference }}{% endif %}"
                class="delete" rel="popup">{% trans 'Delete' %}</a>
             {% endif %}
             {% else %}
             <a href="{% url 'combo-manager-asset-overwrite' %}?img={{asset.filepath|iriencode}}"
                class="overwrite" rel="popup">{% trans 'Overwrite' %}</a>
             <a href="{% url 'combo-manager-asset-delete' %}?img={{asset.filepath|iriencode}}"
                class="delete" rel="popup">{% trans 'Delete' %}</a>
             {% endif %}
           </td>
         </tr>
         {% endfor %}
       </tbody>
     </table>

     {% extends "combo/manager_base.html" %}
     {% load i18n %}
     {% block appbar %}
     <h2>{% trans 'Assets' %}</h2>
     {% endblock %}
     {% block breadcrumb %}
     {{ block.super }}
     <a href="{% url 'combo-manager-assets' %}">{% trans 'Assets' %}</a>
     {% endblock %}
     {% block content %}
     <div id="assets-listing">
     {% include "combo/manager_assets_fragment.html" %}
     </div>
     {% endblock %}

     assets_manager_urls = [
         url(r'^$', views.assets, name='combo-manager-assets'),
         url(r'^slots/(?P<cell_reference>[\w_-]+)/$', views.slot_assets, name='combo-manager-slot-assets'),
         url(r'^delete$', views.asset_delete, name='combo-manager-asset-delete'),
         url(r'^overwrite/$', views.asset_overwrite, name='combo-manager-asset-overwrite'),
         url(r'^upload/$', views.asset_upload, name='combo-manager-asset-upload'),
-...
         url(r'^manage/assets/', decorated_includes(manager_required,
             include(assets_manager_urls))),
         url('^api/assets/set/(?P<key>[\w_:-]+)/$', api_views.view_set,
         url(r'^api/assets/set/(?P<key>[\w_:-]+)/$', api_views.view_set,
             name='api-assets-set'),
+    ]

     from django.conf import settings
     from django.contrib import messages
     from django.core.exceptions import PermissionDenied
     from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
     from django.core.files.storage import default_storage
     from django.core.urlresolvers import reverse, reverse_lazy
     from django.http import Http404, HttpResponse
-...
                     Assets(request=self.request).get_anchored_url(
                         name=os.path.basename(img_orig)))
     asset_delete = AssetDelete.as_view()
     class SlotAssets(ListView):
         template_name = 'combo/manager_slot_assets.html'
         def get_assets(self, cell):
             asset_slots = cell.get_asset_slots()
             assets = dict([(x.key, x) for x in Asset.objects.filter(key__in=asset_slots.keys())])
             for key, value in asset_slots.items():
                 yield SlotAsset(
                     key,
                     name=value.get('short_label'),
                     asset_type=value.get('asset-type', 'image'),
                     asset=assets.get(key))
         def get_queryset(self):
             cell_reference = self.kwargs['cell_reference']
             try:
                 cell = CellBase.get_cell(cell_reference)
             except ObjectDoesNotExist:
                 raise Http404()
             return self.get_assets(cell)
         def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
             context['cell_reference'] = self.kwargs['cell_reference']
             return context
     slot_assets = SlotAssets.as_view()
     class SlotAssetUpload(FormView):
         form_class = AssetUploadForm
         template_name = 'combo/manager_asset_upload.html'
-...
             return super(SlotAssetUpload, self).form_valid(form)
         def get_success_url(self):
             if self.request.GET.get('cell_reference'):
                 cell_reference = self.request.GET['cell_reference']
                 try:
                     cell = CellBase.get_cell(cell_reference)
                 except ObjectDoesNotExist:
                     pass
                 else:
                     return reverse('combo-manager-page-view', kwargs={'pk': cell.page_id}) + '#cell-' + cell_reference
             return Assets(request=self.request).get_anchored_url(key=self.kwargs['key'])
     slot_asset_upload = SlotAssetUpload.as_view()
-...
         def post(self, request, *args, **kwargs):
             Asset.objects.filter(key=kwargs['key']).delete()
             if self.request.GET.get('cell_reference'):
                 cell_reference = self.request.GET['cell_reference']
                 try:
                     cell = CellBase.get_cell(cell_reference)
                 except ObjectDoesNotExist:
                     pass
                 else:
                     return redirect(
                         reverse('combo-manager-page-view', kwargs={'pk': cell.page_id}) + '#cell-' + cell_reference)
             return redirect(Assets(request=self.request).get_anchored_url(key=kwargs['key']))
     slot_asset_delete = SlotAssetDelete.as_view()

                     'label': self.get_label_for_asset(),
                     'suffix': suffix
+                }
                 short_label = u'%(prefix)s%(suffix)s' % {
                     'prefix': slot_template_data['prefix'],
                     'suffix': suffix
+                }
                 slots[slot_key] = {
                     'label': label
                     'label': label,
                     'short_label': short_label,
+                }
                 slots[slot_key].update(slot_template_data)
             return slots

     	width: 80%;
+    }
     #assets-browser #assets-listing table th,
     #assets-browser #assets-listing table td {
     #assets-listing table th,
     #assets-listing table td {
     	text-align: left;
     	padding-left: 1ex;
+    }
     #assets-browser #assets-listing table td.image {
     #assets-listing table td.image {
     	padding: 0;
     	text-align: center;
+    }
     #assets-browser #assets-listing table td.actions {
     #assets-listing table td.actions {
     	width: 80px;
+    }
     #assets-browser #assets-listing table td.actions a.overwrite,
     #assets-browser #assets-listing table td.actions a.delete {
     #assets-listing table td.actions a.overwrite,
     #assets-listing table td.actions a.delete {
     	display: inline-block;
     	border: none;
     	overflow: hidden;
-...
     	line-height: 30px;
+    }
     #assets-browser #assets-listing table td.actions a.delete::before {
     #assets-listing table td.actions a.delete::before {
     	text-align: center;
     	font-family: FontAwesome;
     	content: "\f057"; /* remove-sign */
-...
     	width: 30px;
+    }
     #assets-browser #assets-listing table td.actions a.overwrite::before {
     #assets-listing table td.actions a.overwrite::before {
     	text-align: center;
     	font-family: FontAwesome;
     	content: "\f093"; /* upload */

combo/manager/templates/combo/manager_edit_cell_block.html
17	17	<a rel="popup" href="{% url 'combo-manager-page-delete-cell' page_pk=page.id cell_reference=cell.get_reference %}">{% trans 'Delete' %}</a> \|
18	18	<a rel="popup" href="{% url 'combo-manager-page-visibility-cell' page_pk=page.id cell_reference=cell.get_reference %}">{% trans 'Visibility' %}</a> \|
19	19	<a rel="popup" href="{% url 'combo-manager-page-options-cell' page_pk=page.id cell_reference=cell.get_reference %}">{% trans 'Options' %}</a> \|
	20	{% if cell.can_have_assets %}<a rel="popup" data-selector="div#assets-listing" href="{% url 'combo-manager-slot-assets' cell_reference=cell.get_reference %}">{% trans 'Assets' %}</a> \|{% endif %}
20	21	<a class="close-button" href="#">{% trans 'Close' %}</a>
21	22	{% if form %}
22	23	<button class="save submit-button">{% trans 'Save' %}</button>

         resp = resp.form.submit()
         assert resp.text.count('<tr class="asset') == 2
     def test_asset_slots_management(app, admin_user):
         app = login(app)
         assert Asset.objects.count() == 0
-...
             assert '>CGU<' in resp.text
     def test_asset_slots_for_cells_management(settings, app, admin_user):
         app = login(app)
         assert Asset.objects.count() == 0
         settings.COMBO_CELL_ASSET_SLOTS = {'data_textcell': {'picture': {'prefix': 'Picture'}}}
         page = Page.objects.create(title='xxx', slug='test_cell_assets', template_name='standard')
         cell = TextCell.objects.create(page=page, order=0, slug='foo')
         resp = app.get('/manage/assets/slots/%s/' % cell.get_reference())
         assert '>Overwrite<' in resp.text
         assert '>Delete<' not in resp.text
         resp = resp.click('Overwrite')
         resp.form['upload'] = Upload(
             'test.png',
             base64.decodebytes(b'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVQI12NgAgAABAADRWoApgAA\nAABJRU5ErkJggg=='),
             'image/png')
         resp = resp.form.submit()
         assert resp.location.endswith('/manage/pages/%s/#cell-%s' % (page.pk, cell.get_reference()))
         assert Asset.objects.filter(key=cell.get_asset_slot_key('picture')).count() == 1
         assert app.get('/assets/%s' % cell.get_asset_slot_key('picture'), status=302)['location'].endswith('test.png')
         # upload a new version of image
         resp = app.get('/manage/assets/slots/%s/' % cell.get_reference())
         resp = resp.click('Overwrite')
         resp.form['upload'] = Upload(
             'test2.png',
             base64.decodebytes(b'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVQI12NgAgAABAADRWoApgAA\nAABJRU5ErkJggg=='),
             'image/png')
         resp = resp.form.submit()
         resp = app.get('/manage/assets/slots/%s/' % cell.get_reference())
         assert 'test2.png' in resp.text
         assert '<img data-href' in resp.text  # thumbnail
         assert '>Delete<' in resp.text
         assert Asset.objects.filter(key=cell.get_asset_slot_key('picture')).count() == 1
         # delete the image
         resp = app.get('/manage/assets/slots/%s/' % cell.get_reference())
         resp = resp.click('Delete')
         resp = resp.form.submit()
         assert resp.location.endswith('/manage/pages/%s/#cell-%s' % (page.pk, cell.get_reference()))
         resp = app.get('/manage/assets/slots/%s/' % cell.get_reference())
         assert '>Overwrite<' in resp.text
         assert '>Delete<' not in resp.text
         assert Asset.objects.filter(key=cell.get_asset_slot_key('picture')).count() == 0
         assert app.get('/assets/%s' % cell.get_asset_slot_key('picture'), status=404)
     def test_asset_slots_export(app, admin_user):
         app = login(app)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0003-assets-display-assets-related-to-cell-in-popup-40223.patch