0003-rename-parameters-to-extra-variables.patch

Frédéric Péters, 04 février 2022 08:43

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

Subject: [PATCH 3/3] rename "parameters" to "extra variables"

 ...e_parameters.py => 0053_page_variables.py} |  2 +-
 combo/data/models.py                          | 10 ++++-----
 combo/manager/forms.py                        |  6 ++---
 ...ameters.html => page_extra_variables.html} |  2 +-
 combo/manager/templates/combo/page_view.html  |  9 +++++---
 combo/manager/urls.py                         |  6 ++---
 combo/manager/views.py                        | 21 +++++++++---------
 combo/public/views.py                         |  2 +-
 tests/test_manager.py                         | 22 +++++++++----------
 tests/test_public.py                          |  6 ++---
 10 files changed, 44 insertions(+), 42 deletions(-)
 rename combo/data/migrations/{0053_page_parameters.py => 0053_page_variables.py} (91%)
 rename combo/manager/templates/combo/{page_parameters.html => page_extra_variables.html} (97%)

         operations = [
             migrations.AddField(
                 model_name='page',
                 name='parameters',
                 name='extra_variables',
                 field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
             ),
+        ]

         order = models.PositiveIntegerField()
         exclude_from_navigation = models.BooleanField(_('Exclude from navigation'), default=True)
         redirect_url = models.CharField(_('Redirect URL'), max_length=200, blank=True)
         parameters = JSONField(blank=True, default=dict)
         extra_variables = JSONField(blank=True, default=dict)
         public = models.BooleanField(_('Public'), default=True)
         groups = models.ManyToManyField(Group, verbose_name=_('Groups'), blank=True)
-...
         def get_last_update_time(self):
             return self.last_update_timestamp
         def get_parameters(self, request, original_context):
         def get_extra_variables(self, request, original_context):
             result = {}
             context = RequestContext(request)
             context.push(original_context)
             for key, tplt in (self.parameters or {}).items():
             for key, tplt in (self.extra_variables or {}).items():
                 try:
                     template = Template(tplt)
                 except TemplateSyntaxError:
-...
                 result[key] = template.render(context)
             return result
         def get_parameters_keys(self):
             return sorted((self.parameters or {}).keys())
         def get_extra_variables_keys(self):
             return sorted((self.extra_variables or {}).keys())
         def is_new(self):
             return self.creation_timestamp > timezone.now() - datetime.timedelta(days=7)

             field_classes = {'picture': ImageIncludingSvgField}
     class PageEditParameterForm(forms.Form):
         key = forms.CharField(label=_('Property name'), required=False)
     class PageEditExtraVariableForm(forms.Form):
         key = forms.CharField(label=_('Variable name'), required=False)
         value = forms.CharField(
             label=_('Value template'), widget=forms.TextInput(attrs={'size': 60}), required=False
+        )
     PageEditParameterFormSet = formset_factory(PageEditParameterForm)
     PageEditExtraVariablesFormSet = formset_factory(PageEditExtraVariableForm)
     class PageVisibilityForm(forms.ModelForm):

           {% endfor %}
           </tbody>
       </table>
       <button id="add-page-property-form" type="button">{% trans "Add another property" %}</button>
       <button id="add-page-property-form" type="button">{% trans "Add another" %}</button>
       <div class="buttons">
         <button class="submit-button">{% trans "Save" %}</button>
         <a class="cancel" href="{% url 'combo-manager-page-view' pk=object.pk %}">{% trans 'Cancel' %}</a>

     {% if request.user.is_superuser %}
       <li><a class="action-add-child" rel="popup" href="{% url 'combo-manager-page-add-child' pk=object.id %}">{% trans 'Add a child page' %}</a></li>
       <li><a class="action-edit-roles" rel="popup" href="{% url 'combo-manager-page-edit-roles' pk=object.id %}">{% trans 'Manage edit roles' %}</a></li>
       <li><a class="action-edit-page-variables" rel="popup" href="{% url 'combo-manager-page-edit-extra-variables' pk=object.id %}">{% trans "Edit extra page variables" %}</a></li>
       <li><a rel="popup" class="action-duplicate" href="{% url 'combo-manager-page-duplicate' pk=object.id %}">{% trans 'Duplicate' %}</a></li>
       <li><a class="action-delete" rel="popup" href="{% url 'combo-manager-page-delete' pk=object.id %}">{% trans 'Delete' %}</a></li>
     {% endif %}
-...
     (<a rel="popup" href="{% url 'combo-manager-page-edit-picture' pk=object.id %}">{% trans 'change' %}</a>)
     </p>
     {% if object.extra_variables %}
     <p>
     <label>{% trans 'Parameters:' %}</label>
     {% for key in object.get_parameters_keys %}<i>{{ key }}</i>{% if not forloop.last %}, {% endif %}{% empty %}<i>{% trans 'none' context 'parameters' %}</i>{% endfor %}
     (<a rel="popup" href="{% url 'combo-manager-page-edit-parameters' pk=object.id %}">{% trans 'change' %}</a>)
     <label>{% trans 'Extra variables:' %}</label>
     {% for key in object.get_extra_variables_keys %}<i>{{ key }}</i>{% if not forloop.last %}, {% endif %}{% endfor %}
     (<a rel="popup" href="{% url 'combo-manager-page-edit-extra-variables' pk=object.id %}">{% trans 'change' %}</a>)
     </p>
     {% endif %}
     </div>

             name='combo-manager-page-remove-picture',
         ),
         url(
             r'^pages/(?P<pk>\d+)/parameters/$',
             views.page_edit_parameters,
             name='combo-manager-page-edit-parameters',
             r'^pages/(?P<pk>\d+)/extra-variables/$',
             views.page_edit_extra_variables,
             name='combo-manager-page-edit-extra-variables',
         ),
         url(r'^pages/(?P<pk>\d+)/delete$', staff_required(views.page_delete), name='combo-manager-page-delete'),
         url(r'^pages/(?P<pk>\d+)/export$', views.page_export, name='combo-manager-page-export'),

         PageAddForm,
         PageDuplicateForm,
         PageEditDescriptionForm,
         PageEditExtraVariablesFormSet,
         PageEditIncludeInNavigationForm,
         PageEditParameterFormSet,
         PageEditPictureForm,
         PageEditRedirectionForm,
         PageEditRolesForm,
-...
     page_remove_picture = PageRemovePictureView.as_view()
     class PageEditParametersView(PageEditView):
         form_class = PageEditParameterFormSet
         comment = _('changed parameters')
         template_name = 'combo/page_parameters.html'
         page_title = _('Page properties')
     class PageEditExtraVariablesView(PageEditView):
         form_class = PageEditExtraVariablesFormSet
         comment = _('changed extra variables')
         template_name = 'combo/page_extra_variables.html'
         page_title = _('Extra page variables')
         def get_initial(self):
             return sorted(
                 ({'key': k, 'value': v} for k, v in self.get_object().parameters.items()), key=itemgetter('key')
                 ({'key': k, 'value': v} for k, v in self.get_object().extra_variables.items()),
                 key=itemgetter('key'),
+            )
         def get_form_kwargs(self):
-...
         def form_valid(self, form):
             self.object = self.get_object()
             self.object.parameters = {}
             self.object.extra_variables = {}
             for sub_data in form.cleaned_data:
                 if not sub_data.get('key'):
                     continue
                 self.object.parameters[sub_data['key']] = sub_data['value']
                 self.object.extra_variables[sub_data['key']] = sub_data['value']
             self.object.save()
             PageSnapshot.take(self.object, request=self.request, comment=self.comment)
             return HttpResponseRedirect(self.get_success_url())
     page_edit_parameters = PageEditParametersView.as_view()
     page_edit_extra_variables = PageEditExtraVariablesView.as_view()
     class PageView(ManagedPageMixin, DetailView):

             ctx['selected_user'] = get_user_from_name_id(ctx['name_id'])
         if 'page' in ctx:
             page = ctx['page']
             ctx.update(page.get_parameters(request, ctx))
             ctx.update(page.get_extra_variables(request, ctx))
     @csrf_exempt

         assert Page.objects.get(id=page.id).picture.url in resp.text
     def test_page_edit_parameters(app, admin_user):
     def test_page_edit_extra_variables(app, admin_user):
         app = login(app)
         page = Page.objects.create(title='One', slug='one', template_name='standard')
         assert page.parameters == {}
         assert page.extra_variables == {}
         resp = app.get('/manage/pages/%s/' % page.id)
         assert resp.text.count('<i>none</i>') == 4
         resp = resp.click(href='.*/parameters/')
         assert '<label>Extra variables:</label>' not in resp.text
         resp = resp.click(href='.*/extra-variables/')
         resp.form['form-0-key'] = 'foo'
         resp.form['form-0-value'] = 'bar'
         resp = resp.form.submit().follow()
         page.refresh_from_db()
         assert page.parameters == {'foo': 'bar'}
         assert resp.text.count('<i>none</i>') == 3
         assert page.extra_variables == {'foo': 'bar'}
         assert '<label>Extra variables:</label>' in resp.text
         assert '<i>foo</i>' in resp
         resp = resp.click(href='.*/parameters/')
         resp = resp.click(href='.*/extra-variables/', index=0)
         assert resp.form['form-TOTAL_FORMS'].value == '2'
         assert resp.form['form-0-key'].value == 'foo'
         assert resp.form['form-0-value'].value == 'bar'
-...
         resp.form['form-1-value'] = 'baz'
         resp = resp.form.submit().follow()
         page.refresh_from_db()
         assert page.parameters == {
         assert page.extra_variables == {
             'foo': 'bar-bis',
             'blah': 'baz',
+        }
         assert resp.text.count('<i>none</i>') == 3
         assert '<i>blah</i>, <i>foo</i>' in resp
         resp = resp.click(href='.*/parameters/')
         resp = resp.click(href='.*/extra-variables/', index=0)
         assert resp.form['form-TOTAL_FORMS'].value == '3'
         assert resp.form['form-0-key'].value == 'blah'
         assert resp.form['form-0-value'].value == 'baz'
-...
         resp.form['form-0-key'] = ''
         resp = resp.form.submit().follow()
         page.refresh_from_db()
         assert page.parameters == {
         assert page.extra_variables == {
             'foo': 'bar',
+        }
         assert resp.text.count('<i>none</i>') == 3
         assert '<i>foo</i>' in resp

             assert resp.context['card_foo_bar_id'] == '42'
     def test_page_parameters(app):
     def test_page_extra_variables(app):
         page = Page.objects.create(
             title='Home',
             slug='page',
             template_name='standard',
             parameters={'foo': 'bar', 'bar_id': '{{ 40|add:2 }}'},
             extra_variables={'foo': 'bar', 'bar_id': '{{ 40|add:2 }}'},
+        )
         cell = JsonCell.objects.create(
             page=page,
-...
+            )
         assert resp.text.strip() == 'XXbarYY42ZZ'
         # check sub_slug/parameters override
         # check sub_slug/extra_variables override
         page.sub_slug = '(?P<fooo>[a-z]+)'
         page.save()
         cell.template_string = 'XX{{ foo }}YY{{ bar_id }}ZZ{{ fooo }}AA'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0003-rename-parameters-to-extra-variables.patch