Skip to content
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

[FW][FIX] web: more reliably avoid downloads on new file #77703

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Oct 4, 2021

5195550 mitigated an issue of being
able to try and download files which don't exist yet, make the fix
more reliable by clearing out the field completely before only
re-inserting content.

Also clean up the code:

  • an old-style forward port created a duplicate fixprovement
    (a8d01cb) which seems less correct
    as it applies conditionally
  • and the code is branchier than necessary, we can make it simpler by
    judiciously leveraging jquery's API

Forward-Port-Of: #77603

@robodoo
Copy link
Contributor

robodoo commented Oct 4, 2021

@robodoo robodoo added conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot labels Oct 4, 2021
@fw-bot
Copy link
Contributor Author

fw-bot commented Oct 4, 2021

Ping @xmo-odoo cherrypicking of pull request #77603 failed.

stderr:

12:43:25.912217 git.c:344               trace: built-in: git cherry-pick c246df2fa4ec2052dde8752331ca84a250d4ca4b
error: could not apply c246df2fa4e... [FIX] web: more reliably avoid downloads on new file
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

@C3POdoo C3POdoo added the RD research & development, internal work label Oct 4, 2021
@xmo-odoo xmo-odoo force-pushed the saas-12.3-11.0-cleanup-binary-xmo-6f97-fw branch from 7c17767 to 43a5d43 Compare October 4, 2021 11:25
@xmo-odoo
Copy link
Collaborator

xmo-odoo commented Oct 4, 2021

@robodoo r+

@C3POdoo C3POdoo requested a review from a team October 4, 2021 11:27
5195550 mitigated an issue of being
able to try and download files which don't exist yet, make the fix
more reliable by clearing out the field completely and hiding the
content if the (readonly) field has no value *or the record is not
saved yet*.

Also clean up the code:

* an old-style forward port created a duplicate fixprovement
  (a8d01cb) which seems less correct
  as it applies conditionally
* and the code is branchier than necessary, we can make it simpler by
  judiciously leveraging jquery's API

X-original-commit: 0eccd39
@xmo-odoo xmo-odoo force-pushed the saas-12.3-11.0-cleanup-binary-xmo-6f97-fw branch from 43a5d43 to d2656cc Compare October 4, 2021 13:23
@xmo-odoo
Copy link
Collaborator

xmo-odoo commented Oct 4, 2021

@robodoo r+

robodoo pushed a commit that referenced this pull request Oct 4, 2021
5195550 mitigated an issue of being
able to try and download files which don't exist yet, make the fix
more reliable by clearing out the field completely and hiding the
content if the (readonly) field has no value *or the record is not
saved yet*.

Also clean up the code:

* an old-style forward port created a duplicate fixprovement
  (a8d01cb) which seems less correct
  as it applies conditionally
* and the code is branchier than necessary, we can make it simpler by
  judiciously leveraging jquery's API

closes #77703

X-original-commit: 0eccd39
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
@robodoo robodoo closed this Oct 4, 2021
@robodoo robodoo temporarily deployed to merge October 4, 2021 15:03 Inactive
@fw-bot fw-bot deleted the saas-12.3-11.0-cleanup-binary-xmo-6f97-fw branch October 18, 2021 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants