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

Fix LT-21933: Picture thumbnail is not showing configuration dialog #200

Merged
merged 2 commits into from
Nov 12, 2024

Conversation

jtmaxwell3
Copy link
Collaborator

@jtmaxwell3 jtmaxwell3 commented Nov 11, 2024

This bug was introduced on April 12th. I reverted the change that caused the bug and then added a useUri parameter to GenerateSettings to get the desired behavior for Word after consulting with Ariel.


This change is Reviewable

Copy link
Contributor

@jasonleenaylor jasonleenaylor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @jtmaxwell3)

Copy link
Contributor

@aror92 aror92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @jtmaxwell3)


Src/xWorks/ConfiguredLcmGenerator.cs line 3196 at r1 (raw file):

			}

			public GeneratorSettings(LcmCache cache, ReadOnlyPropertyTable propertyTable, bool relativePaths, bool useUri, bool copyFiles, string exportPath, bool rightToLeft = false, bool isWebExport = false, bool isTemplate = false)

GeneratorSettings is also used by the LcmJsonGenerator and LcmXhtmlGenerator. This change to the arguments needs to be handled in those files as well.

I see some potential for confusion since the decision whether or not to useUri still partly depends on the value of relativePaths. (i.e. if relativePaths is true AND useUri is true, the Uri won't actually be used.) It may be better to call this something like "forceToUseFilepath" or "forceNotToUseUri", set the value to True for the word export, and change the behavior to "return (settings.UseRelativePaths || settings.forceNotToUseUri) ? filePath : new Uri(filePath).ToString();"

Copy link
Contributor

@aror92 aror92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @jtmaxwell3)


Src/xWorks/ConfiguredLcmGenerator.cs line 3196 at r1 (raw file):

Previously, aror92 (Ariel Ror.) wrote…

GeneratorSettings is also used by the LcmJsonGenerator and LcmXhtmlGenerator. This change to the arguments needs to be handled in those files as well.

I see some potential for confusion since the decision whether or not to useUri still partly depends on the value of relativePaths. (i.e. if relativePaths is true AND useUri is true, the Uri won't actually be used.) It may be better to call this something like "forceToUseFilepath" or "forceNotToUseUri", set the value to True for the word export, and change the behavior to "return (settings.UseRelativePaths || settings.forceNotToUseUri) ? filePath : new Uri(filePath).ToString();"

Ah, nevermind, I missed that you made an alternate constructor.

@JakeOliver28 JakeOliver28 enabled auto-merge (squash) November 12, 2024 15:41
@JakeOliver28 JakeOliver28 merged commit 2d05f6f into release/9.1 Nov 12, 2024
4 of 5 checks passed
@JakeOliver28 JakeOliver28 deleted the LT-21933 branch November 12, 2024 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants