0001-assets-add-dynamic-asset-slots-to-category-and-form-.patch

Frédéric Péters, 29 juin 2018 15:55

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

Subject: [PATCH] assets: add dynamic asset slots to category and form cells
 (#24770)

 combo/apps/assets/views.py | 16 +++++++++++-----
 combo/apps/wcs/models.py   | 21 +++++++++++++++++++++
 combo/data/models.py       |  3 +++
 combo/settings.py          |  5 +++++
 tests/test_wcs.py          | 27 +++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 5 deletions(-)

     import ckeditor
     from sorl.thumbnail.shortcuts import get_thumbnail
     from combo.data.models import CellBase
     from .forms import AssetUploadForm
     from .models import Asset
-...
     class SlotAsset(object):
         def __init__(self, key=None, asset=None):
         def __init__(self, key=None, name=None, asset=None):
             self.key = key
             self.name = settings.COMBO_ASSET_SLOTS[key]['label']
             self.name = name
             self.asset = asset
         def is_image(self):
-...
         @classmethod
         def get_assets(cls):
             assets = dict([(x.key, x) for x in Asset.objects.all() if x.key in settings.COMBO_ASSET_SLOTS])
             for key, value in settings.COMBO_ASSET_SLOTS.items():
                 yield cls(key, asset=assets.get(key))
             assets = dict([(x.key, x) for x in Asset.objects.all()])
             uniq_slots = {}
             uniq_slots.update(settings.COMBO_ASSET_SLOTS)
             for cell in CellBase.get_cells(cell_filter=lambda x: bool(x.get_asset_slots)):
                 uniq_slots.update(cell.get_asset_slots())
             for key, value in uniq_slots.items():
                 yield cls(key, name=value.get('label'), asset=assets.get(key))
     class Assets(ListView):

     # -*- coding: utf-8 -*-
+    #
     # combo - content management system
     # Copyright (C) 2014-2015  Entr'ouvert
+    #
-...
     import logging
     from django import template
     from django.conf import settings
     from django.db import models
     from django.forms import models as model_forms
     from django.forms import Select
-...
                 'text': text,
                 }]
         def get_asset_slots(self):
             slots = {}
             for slot_template_key, slot_template_data in settings.WCS_FORM_ASSET_SLOTS.items():
                 slots['wcs:form:%s:%s' % (slot_template_key, self.formdef_reference)] = {
                         'label': u'%(prefix)s — %(label)s' % {
                             'prefix': slot_template_data['prefix'],
                             'label': self.cached_title}}
             return slots
     class WcsCommonCategoryCell(CellBase):
         is_enabled = classmethod(is_wcs_enabled)
-...
                 return
             return self.cached_title
         def get_asset_slots(self):
             slots = {}
             for slot_template_key, slot_template_data in settings.WCS_CATEGORY_ASSET_SLOTS.items():
                 slots['wcs:category:%s:%s' % (slot_template_key, self.category_reference)] = {
                         'label': u'%(prefix)s — %(label)s' % {
                             'prefix': slot_template_data['prefix'],
                             'label': self.cached_title}}
             return slots
     @register_cell_class
     class WcsCategoryCell(WcsCommonCategoryCell):

         # get_badge(self, context); set to None so cell types can be skipped easily
         get_badge = None
         # get_asset_slots(self); set to None so cell types can be skipped easily
         get_asset_slots = None
         # message displayed when the cell is loaded asynchronously
         loading_message = _('Loading...')

     # example: {'banner': {'label': 'Banner image'}}
     COMBO_ASSET_SLOTS = {}
     # dynamic slots created for wcs category/form cells
     # example: {'picture': {'prefix': 'Picture'}}
     WCS_CATEGORY_ASSET_SLOTS = {}
     WCS_FORM_ASSET_SLOTS = {}
     # hide work-in-progress/experimental/whatever cells for now
     BOOKING_CALENDAR_CELL_ENABLED = False
     NEWSLETTERS_CELL_ENABLED = False

     # -*- coding: utf-8 -*-
     import pytest
     import json
-...
     from django.conf import settings
     from django.core.cache import cache
     from django.test import override_settings
     from django.test.client import RequestFactory
     from combo.data.models import Page
-...
         resp.form['cell'] = 'xxxx'
         resp.form['code'] = 'CNPHNTFB'
         resp = resp.form.submit(status=400)
     @wcsctl_present
     def test_cell_assets(app, admin_user):
         page = Page(title='xxx', slug='test_cell_assets', template_name='standard')
         page.save()
         cell = WcsFormCell(page=page, placeholder='content', order=0)
         cell.formdef_reference = u'default:form-title'
         cell.save()
         cell = WcsFormsOfCategoryCell(page=page, placeholder='content', order=0)
         cell.category_reference = 'default:test-9'
         cell.ordering = 'alpha'
         cell.save()
         app = login(app)
         resp = app.get('/manage/assets/')
         assert 'have any asset yet.' in resp.content
         with override_settings(
                 WCS_CATEGORY_ASSET_SLOTS={'logo': {'prefix': 'Logo'}},
                 WCS_FORM_ASSET_SLOTS={'picture': {'prefix': 'Picture'}}):
             resp = app.get('/manage/assets/')
             assert '>Logo — Test 9<' in resp.content
             assert '>Picture — form title<' in resp.content
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-assets-add-dynamic-asset-slots-to-category-and-form-.patch