New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix redundant fallback template value #199

Merged
merged 2 commits into from Jul 8, 2017

Conversation

Projects
None yet
2 participants
@zemm
Contributor

zemm commented Jul 5, 2017

|nothing in conjunction with structure or provider: (not sure which)
caused ContentProviderLookupError: archetypes.edit.beforefieldsets|nothing error
for me in some cases while debugging broken RichTextField.
It seems that it might not be a valid syntax?

In any case, it seems to be redundant, since there is also
tal:on-error="nothing", and subsequent equivalent
tal:replace="provider:archetypes.edit.afterfieldsets"
does not have it either.

Fix redundant template fallback value causing errors
`|nothing` in conjunction with `structure` or `provider:` (not sure which)
caused `ContentProviderLookupError: archetypes.edit.beforefieldsets|nothing`
for me in some cases while debugging broken `RichTextField`.
It seems that it might not be a valid syntax?

In any case, it seems to be redundant, since there is also
`tal:on-error="nothing"`, and subsequent equicalent
`tal:replace="provider:archetypes.edit.afterfieldsets"`
does not have it either.
@zemm

This comment has been minimized.

Show comment
Hide comment
@zemm

zemm Jul 6, 2017

Contributor

The test seems to be failing because with |nothing, it rendered an empty <div></div> between the <form name="edit_form"... and <div id="pfg-fieldwrapper">, and now it's absent. This missing empty div seems to fail the test.

So the doctest ellipses seem to require something between the two elements:

    ...<div class="pfg-form formid-testform">
        <form name="edit_form" method="post" enctype="multipart/form-data" class="fgBaseEditForm..." action="..." id="fg-base-edit">
    ...
            <div id="pfg-fieldwrapper">

Not sure yet what would be an appropriate fix. I'll also recheck what the original error was, if I was mistaken, and why does it work most of the time.

Contributor

zemm commented Jul 6, 2017

The test seems to be failing because with |nothing, it rendered an empty <div></div> between the <form name="edit_form"... and <div id="pfg-fieldwrapper">, and now it's absent. This missing empty div seems to fail the test.

So the doctest ellipses seem to require something between the two elements:

    ...<div class="pfg-form formid-testform">
        <form name="edit_form" method="post" enctype="multipart/form-data" class="fgBaseEditForm..." action="..." id="fg-base-edit">
    ...
            <div id="pfg-fieldwrapper">

Not sure yet what would be an appropriate fix. I'll also recheck what the original error was, if I was mistaken, and why does it work most of the time.

Fix integration test to handle missing empty div
b10ef37 caused an empty div between <form name="edit_form" and
<div id="pfg-fieldwrapper"> to be absent. For some reasons,
current integration test required something (anything) to be
between the two elements. This handles the both cases where
there is content between them or not.

@zemm zemm changed the title from Fix broken fallback template value to Fix redundant fallback template value Jul 7, 2017

@zemm

This comment has been minimized.

Show comment
Hide comment
@zemm

zemm Jul 7, 2017

Contributor

Now after testing again, it seems that the actual problem might have been and is fixed by plone/Products.Archetypes#94, and the original error message pointed . This |nothing still seems like redundancy, but not that critical now.

Contributor

zemm commented Jul 7, 2017

Now after testing again, it seems that the actual problem might have been and is fixed by plone/Products.Archetypes#94, and the original error message pointed . This |nothing still seems like redundancy, but not that critical now.

@mauritsvanrees

This comment has been minimized.

Show comment
Hide comment
@mauritsvanrees

mauritsvanrees Jul 8, 2017

Collaborator

Somehow the actual problem that you found, causes this traceback that blames the provider. The traceback is basically lying, because it is not happening in those lines of the template.

But yes, removing the |nothing seems fine when I try it. It makes it the look the same as the archetypes.edit.afterfieldsets provider a few lines down.

Collaborator

mauritsvanrees commented Jul 8, 2017

Somehow the actual problem that you found, causes this traceback that blames the provider. The traceback is basically lying, because it is not happening in those lines of the template.

But yes, removing the |nothing seems fine when I try it. It makes it the look the same as the archetypes.edit.afterfieldsets provider a few lines down.

@mauritsvanrees mauritsvanrees merged commit b13fbc0 into smcmahon:master Jul 8, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@mauritsvanrees

This comment has been minimized.

Show comment
Hide comment
@mauritsvanrees

mauritsvanrees Jul 8, 2017

Collaborator

This fix is in release 1.8.4 (today).

Collaborator

mauritsvanrees commented Jul 8, 2017

This fix is in release 1.8.4 (today).

keul added a commit to abstract-open-solutions/Products.PloneFormGen that referenced this pull request Sep 22, 2017

Squashed commit of the following:
commit 3f36b4a
Merge: a1387c8 c389777
Author: Luca Fabbri <luca@keul.it>
Date:   Fri Sep 22 15:41:23 2017 +0200

    Merge branch 'fix-165' of https://github.com/abstract-open-solutions/Products.PloneFormGen into fix-165

commit a1387c8
Author: Luca Fabbri <luca@keul.it>
Date:   Wed Nov 9 11:06:41 2016 +0100

    Label and descripotion were not copyed on widget change

commit b93fb47
Author: Luca Fabbri <luca@keul.it>
Date:   Wed Nov 9 09:47:02 2016 +0100

    Restored usage of show_hm field

    See also smcmahon#165

commit 343414c
Author: Luca Fabbri <luca@keul.it>
Date:   Tue Nov 8 18:06:47 2016 +0100

    Fixed validation when date is not required (plus tests)

commit bebd64b
Author: Luca Fabbri <luca@keul.it>
Date:   Tue Nov 8 18:05:24 2016 +0100

    Missing test dependency

commit 56b4472
Author: Tom Gross <itconsense@gmail.com>
Date:   Mon May 9 13:14:22 2016 +0000

    fix date validator to work with new pattern widget output

commit f455f34
Author: Tom Gross <itconsense@gmail.com>
Date:   Mon May 9 13:14:04 2016 +0000

    ignor pycharm artefacts

commit 1098704
Author: Tom Gross <itconsense@gmail.com>
Date:   Mon May 9 10:31:47 2016 +0000

    use datepicker widget for datetime input #164

commit f8aa1d7
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jul 8 20:29:41 2017 +0200

    Back to development: 1.8.5

    [ci skip]

commit 19ac10a
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jul 8 20:29:01 2017 +0200

    Preparing release 1.8.4

    [ci skip]

commit bf13b48
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jul 8 20:28:39 2017 +0200

    Cleanup the changelog a bit.

    [ci skip]

commit b13fbc0
Merge: e5163b3 54195c7
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jul 8 19:54:26 2017 +0200

    Merge pull request #199 from jyukopla/fix-redundant-template-syntax

    Fix redundant fallback template value

commit e5163b3
Merge: 18085c3 9ced974
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jul 8 19:39:31 2017 +0200

    Merge pull request #200 from jyukopla/fix/ratescalefield-unicode-error

    Fix/ratescalefield unicode error

commit 54195c7
Author: Jussi Rajala <zemm@iki.fi>
Date:   Fri Jul 7 09:26:32 2017 +0300

    Fix integration test to handle missing empty div

    b10ef37 caused an empty div between <form name="edit_form" and
    <div id="pfg-fieldwrapper"> to be absent. For some reasons,
    current integration test required something (anything) to be
    between the two elements. This handles the both cases where
    there is content between them or not.

commit 9ced974
Author: Valtteri Karppinen <karppinenvaltteri@gmail.com>
Date:   Thu Jul 6 11:21:18 2017 +0300

    update CHANGES.txt

commit 9f2fba2
Author: Valtteri Karppinen <karppinenvaltteri@gmail.com>
Date:   Thu Jul 6 11:20:16 2017 +0300

    Fix UnicodeDecodeError on ratescalefield with non-ascii values

commit b10ef37
Author: Jussi Rajala <zemm@iki.fi>
Date:   Wed Jul 5 15:56:32 2017 +0300

    Fix redundant template fallback value causing errors

    `|nothing` in conjunction with `structure` or `provider:` (not sure which)
    caused `ContentProviderLookupError: archetypes.edit.beforefieldsets|nothing`
    for me in some cases while debugging broken `RichTextField`.
    It seems that it might not be a valid syntax?

    In any case, it seems to be redundant, since there is also
    `tal:on-error="nothing"`, and subsequent equicalent
    `tal:replace="provider:archetypes.edit.afterfieldsets"`
    does not have it either.

commit 18085c3
Merge: fd2b4a6 82f9062
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Tue Jun 6 23:20:46 2017 +0200

    Merge pull request #195 from rodfersou/issue_194

    Remove collective.cover adapter reference

commit 82f9062
Author: Rodrigo Ferreira de Souza <rodfersou@gmail.com>
Date:   Tue May 23 23:07:11 2017 -0300

    Remove collective.cover adapter reference

commit fd2b4a6
Merge: eb3d189 6ae0258
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jun 3 23:35:27 2017 +0200

    Merge pull request #197 from smcmahon/fix-bootstrap

    Fixed bootstrapping.

commit 6ae0258
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jun 3 23:11:42 2017 +0200

    Use Plone 5.0.6 for now.

    5.0.7 gives failures in the tests.
    Seems fine in normal usage.

commit f2333cb
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jun 3 23:01:42 2017 +0200

    Tests: set browser.handleErrors to False.

    That way we get a proper traceback, instead of a general internal server error.

commit 06e68fd
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Sat Jun 3 21:50:23 2017 +0200

    Fixed bootstrapping.

    Both locally and on Travis.
    Note that you need to specify the zc.buildout version when bootstrapping:
    python bootstrap-buildout.py --buildout-version=2.5.3
    For setuptools we use the latest that ez_setup.py gives us, which will remain 33.1.1.

commit eb3d189
Merge: faa4352 82c18e9
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Tue Mar 7 18:35:48 2017 +0100

    Merge pull request #192 from mikerenfro/fix-column-titles

    Adding getColumnNames logic to getColumnTitles

commit 82c18e9
Author: Mike Renfro <mike+github@renf.ro>
Date:   Sun Mar 5 19:03:03 2017 -0600

    Adding getColumnNames logic to getColumnTitles

commit faa4352
Merge: 10bbf17 c345b27
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Mar 1 14:12:53 2017 +0100

    Merge pull request #191 from datakurre/master

    Add missing </div> into quickedit.pt

commit c345b27
Author: Asko Soukka <asko.soukka@iki.fi>
Date:   Fri Feb 24 16:17:25 2017 +0200

    Update changelog

commit 67f1d49
Author: Asko Soukka <asko.soukka@iki.fi>
Date:   Fri Feb 24 16:16:15 2017 +0200

    Add missing closing </div> into quickedit template

commit 10bbf17
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Dec 8 15:45:31 2016 +0100

    Fixed UnicodeDecodeError when vocabulary value is a non-ascii string.

    This could happen in selection and multi selection fields.

commit f5fa695
Merge: 6e7018b 7d99f56
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Fri Dec 16 14:16:02 2016 +0100

    Merge pull request #187 from tkimnguyen/master

    change captcha verification message for #186

commit 7d99f56
Author: T. Kim Nguyen <tkn@alumni.uwaterloo.ca>
Date:   Wed Dec 14 13:28:16 2016 -0600

    change captcha verification message for #186

commit 6e7018b
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Tue Dec 6 15:25:10 2016 +0100

    Back to development: 1.8.4

    [ci skip]

commit 0adae57
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Tue Dec 6 15:24:31 2016 +0100

    Preparing release 1.8.3

    [ci skip]

commit 6829d2f
Author: Philip Bauer <bauer@starzel.de>
Date:   Tue Dec 6 11:27:53 2016 +0100

    Transform value to unicode before translating. Fix #182

commit 709f625
Author: Steve McMahon <steve@dcn.org>
Date:   Tue Nov 22 11:32:04 2016 -0800

    Back to development: 1.8.3

commit e13a9db
Author: Steve McMahon <steve@dcn.org>
Date:   Tue Nov 22 11:30:53 2016 -0800

    Preparing release 1.8.2

commit b90e67d
Merge: 1cf9556 87a4799
Author: Steve McMahon <steve@dcn.org>
Date:   Tue Nov 22 11:24:53 2016 -0800

    Merge pull request #181 from smcmahon/issue-178-helptext-master

    Fixed showing translations of help text. [master]

commit 1cf9556
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Fri Nov 18 18:37:43 2016 +0100

    Added commented-out xlwt egg.

    With this eXceL WriTer you can test the excel export of the Save Data Adapter.

commit 70d0bd8
Merge: c71a53b d8a03a2
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Fri Nov 18 18:27:47 2016 +0100

    Merge remote-tracking branch 'tmog/xls_export'

commit 87a4799
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Fri Nov 18 13:00:49 2016 +0100

    Fixed showing translations of help text.

    Since security release 1.78.1, help text was showing up with only the
    message id, for example `help_placeholder`.

    This fixes issue #178.

commit c71a53b
Author: Harald Friessnegger <harald@webmeisterei.com>
Date:   Thu Sep 3 18:24:52 2015 +0200

    use formActionOverride in embedded view if it has been set

commit c389777
Author: Luca Fabbri <luca@keul.it>
Date:   Wed Nov 9 11:06:41 2016 +0100

    Label and descripotion were not copyed on widget change

commit 42029d8
Author: Luca Fabbri <luca@keul.it>
Date:   Wed Nov 9 09:47:02 2016 +0100

    Restored usage of show_hm field

    See also smcmahon#165

commit 7e96bd2
Author: Luca Fabbri <luca@keul.it>
Date:   Tue Nov 8 18:06:47 2016 +0100

    Fixed validation when date is not required (plus tests)

commit b44b89e
Author: Luca Fabbri <luca@keul.it>
Date:   Tue Nov 8 18:05:24 2016 +0100

    Missing test dependency

commit e920d86
Author: Tom Gross <itconsense@gmail.com>
Date:   Mon May 9 13:14:22 2016 +0000

    fix date validator to work with new pattern widget output

commit b283f0c
Author: Tom Gross <itconsense@gmail.com>
Date:   Mon May 9 13:14:04 2016 +0000

    ignor pycharm artefacts

commit cf16bef
Author: Tom Gross <itconsense@gmail.com>
Date:   Mon May 9 10:31:47 2016 +0000

    use datepicker widget for datetime input #164

commit af24c55
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Tue May 3 12:05:13 2016 +0200

    Back to development: 1.8.2

    [ci skip]

commit b9590e5
Author: Steve McMahon <steve@dcn.org>
Date:   Sun May 1 10:43:14 2016 -0700

    Eliminate XSS vulnerability in field help field

commit d8a03a2
Author: Thomas Clement Mogensen <mogensen@diku.dk>
Date:   Fri Feb 26 14:25:25 2016 +0100

    format web links and numbers as such in excel download. Format based on actual data, not field settings.

commit c86a891
Author: Thomas Clement Mogensen <mogensen@diku.dk>
Date:   Thu Feb 25 13:37:01 2016 +0100

    fix encoding issue in excel document creation

commit be18ed6
Author: Thomas Clement Mogensen <mogensen@diku.dk>
Date:   Wed Feb 24 12:04:35 2016 +0100

    Add option to download data from saveDataAdapter in excel format

commit fc9592b
Author: Steve McMahon <steve@dcn.org>
Date:   Thu Oct 1 09:01:44 2015 -0700

    Update README.rst

commit cf425b1
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 04:50:52 2015 +0200

    Back to development: 1.8.1

    [ci skip]

commit 4ba658b
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 04:48:21 2015 +0200

    Preparing release 1.8.0

    [ci skip]

commit 164be3c
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 04:47:05 2015 +0200

    check-manifest: ignore .gitattributes

commit 881063c
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 04:45:35 2015 +0200

    Fixed rst long description.

commit 4c46113
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 02:16:37 2015 +0200

    Removed deprecated property use_folder_tabs.

commit 26e16d8
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 02:11:59 2015 +0200

    Removed unused property typesLinkToFolderContentsInFC.

    In core Plone this was briefly changed to plone.types_link_to_folder_contents,
    but it was not actually used.

commit cb426ca
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 01:55:29 2015 +0200

    Revert "Moved our types_not_searched settings to the registry."

    This reverts commit 6b4256e.

    It needs a fix in plone.app.registry so that typeinfo is loaded before
    registry.xml, otherwise an install fails.

commit 6b4256e
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 01:11:04 2015 +0200

    Moved our types_not_searched settings to the registry.

commit 8f3e395
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Thu Oct 1 01:04:32 2015 +0200

    Moved our default_page_types setting to the registry.

commit e2e34fb
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Sep 30 20:33:39 2015 +0200

    Rename UTF-8 and utf8 to lowercase utf-8.

    They are all the same and this what Plone uses everywhere (or should be).

commit 3695500
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Sep 30 20:31:41 2015 +0200

    Get email settings from registry.  Fixes several Plone 5 errors.

    Do not use ``plone_utils.getSiteEncoding()``, because this is
    deprecated and always returns ``utf-8''.

commit 8375e49
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Sep 30 20:00:21 2015 +0200

    Load widget specific css on quickedit form.

    We were defining both javascript and css of the addable widgets,
    but were only adding the javascript, not the css.

    The calendar widget is still not really working there.  But if we are
    loading this css when viewing a form, we should load it while
    quickediting the form.  On Plone 4.3 it helped.

commit 37c2148
Merge: 276df36 3aeb6be
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Fri Sep 11 15:59:36 2015 +0200

    Merge remote-tracking branch '4teamwork/fix_embedded_view'

commit 276df36
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Fri Sep 11 15:59:32 2015 +0200

    Tell git to merge CHANGES.txt in union mode.

    bobtemplates.plone does that.

commit 944a6ff
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Fri Sep 11 14:55:09 2015 +0200

    Removed inline javascript that tried to block inline validation.

    It had no effect anymore on Plone 5, as no inline validation is done
    here anyway.

    And it interferes with themes that load jQuery near the bottom instead
    of in the head.

commit 3aeb6be
Author: Thomas Buchberger <t.buchberger@4teamwork.ch>
Date:   Fri Sep 11 11:58:10 2015 +0200

    Fix embedded view by removing global_defines macro.

commit 5ed1635
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Sep 9 20:39:55 2015 +0200

    Back to development: 1.8.0b5

    [ci skip]

commit 4cba4e5
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Sep 9 20:35:02 2015 +0200

    Preparing release 1.8.0b4

    [ci skip]

commit 8499d48
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Sep 9 20:33:43 2015 +0200

    Fixed manifest.

commit 2054b2b
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Sep 9 20:24:05 2015 +0200

    No longer convert long description to ascii.

    Works fine, at least with any recent zest.releaser version.  The
    current text files are already ascii-only, so there the problem never
    occurs, but should be fine anyway.

commit 03428e8
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Tue Sep 8 19:45:26 2015 +0200

    Changed our content types to use TinyMCEWidget instead of RichWidget.

    The old one only showed a plain textarea.
    Fixes issue #152.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment