Revert buggy new bt format and fix Data Stream UI to append to file
Please do not mix it all together ad then in one commit we have both migration to new format, revert (which seems fine) and maybe your add ons (very hard to read).
All of this must be logically separated, thus please do split them in these logical commits:
- Revert (seems OK)
- Your Add ons
- Make new merge request with only this which will be gladly accepted (or fixed if required)
- We check and if OK we ask you make a MR with migration to NEW format
If needed please ask advice from @kirr
Without knowing much about Wendelin specifics, I checked the migration commit and it seems ok now, meaning that no files are deleted and most diff looks typical migrated ERP5 documents. On the other hand, there is some diff that should not be there. E.g. bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_view.xml has an addition, ERP5 Form should not be affected by migration. If this is what @Tyagov means by 'Your Add ons' then it should be splitted I suppose. If not please check why this is there.
@georgios.dagkakis , yes. We will migrate to new format AFTER all is finished in a completely separate commit / MR so all is logical, trace-able and readable.
@Tyagov I just reverted the format migration commit. It wasn't necessary to revert my additions and add them again. The "fix" in this MR's title is only related to the migration itself.
Added 11 commits:
-
ea85b474...093000a8 - 8 commits from branch
nexedi:master
- 35055208 - Revert "erp5_wendelin: business template updated to new format"
- 19f7c70a - Revert "erp5_wendelin: added Data Stream UI to append file"
- 6a5f09e8 - erp5_wendelin: added Data Stream UI to append file
Toggle commit list-
ea85b474...093000a8 - 8 commits from branch
@Tyagov merge requested updated with only: buggy migration and my adds reverted + new commit with my adds. When this is merged I'll open another one for the business template migration.
Added 1 commit:
- 702943ab - erp5_wendelin: added Data Stream UI to append file
@Camata , you forgot that 'portal_types/Data Array Line' and friends are still missing.
Please adjust MR so it's really "Revert of the buggy migration AND my adds" so we have a fresh working state reached then:
-
Just my adds
-
Migration on top of my adds
Thanks
-
@Tyagov they are back there, added in the first revert commit (35055208, which undid the changes in d0de24c4). From browsing the commit's full diff, for example, I found the re-addition of the Data Array Line portal type here: https://lab.nexedi.com/nexedi/wendelin/blob/35055208404d6529d6cb07ff68c3810541eb758f/bt5/erp5_wendelin/PortalTypeTemplateItem/portal_types/Data%2520Array%2520Line.xml. There's no reason for them not to be there, because I reverted the commit that removed them.
Edited by Douglas@Camata , sorry my mistake. all seems ok.
mentioned in commit c9077923
@Camata , Even though I merged I found following problems (I merged so we get back lost functionality).
Please do fix:
-
portal_gadgets/WendelinInformationGadget state should be made public (not invisible like now)
-
portal_gadgets/WendelinInformationGadget should have a default thumbnail (i.e. image). You can simply make print screen and add it
-
When Wendelin gadget rendered I see links like http://wendelin:2200/erp5/$%7Bportal_url%7D/portal_skins/erp5_data_notebook/manage_main looks like script not called that replaces it dynamically ?
-
In /DataStream_view my_append_file is in group "not_assigned" but it should be right under "my_file" in "right" groupd
-
@Tyagov I fixed everything, except for point 3. No matter what I do, it seems like the substitution of variables in form on
${my_var}
isn't working. I followed all the steps found in this tutorial: https://www.erp5.com/erp5-HowTo.Add.Content.Variables.My script used for substitution returns:
{ 'portal_url': 'http://localhost:2200/erp5' }
But no matter where I put
${portal_url}
, it never rendershttp://localhost:2200/erp5
.Note: even though tomorrow is national holiday in Brazil I'll work to fix this ASAP.
Edited by Douglas@Camata , .asStrippedHTML method might help you