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

Add 'fileName' to condition when checking request for logo file. #3119

Merged
merged 3 commits into from
Oct 15, 2019
Merged

Add 'fileName' to condition when checking request for logo file. #3119

merged 3 commits into from
Oct 15, 2019

Conversation

youngcaseho
Copy link
Contributor

@youngcaseho youngcaseho commented Oct 5, 2019

Test Steps

  1. On PersonaBar select Site Settings.
  2. Click left icon in Site Logo area.
  3. Area changes to two drop downs Folder and File.
  4. Select "None Specified" in File drop down.
  5. Press ENTER or click [ENTER]
  6. Click the 'Save' button.
    Expected Result: "Settings have been updated" message should appear without error.
  7. Logout
  8. Log back in.
  9. On PersonaBar select Site Settings.
  10. View Site Logo area.
    Expected Results: No logo should be displayed in the Site Logo area.

Fixes #3095

Summary

The issue here is that the 'folderPath' property on the 'LogoFile' request object is populated with the path that the user selects from the 'Folder' drop-down list, making the request.LogoFile object != null. Because request.LogoFile was not null, the previous logic attempted to retrieve the file even when 'None Specified' was selected from the 'File' drop-down list. I added 'fileName' to the condition to ensure that a file is selected from the 'File' drop-down list before attempting to retrieve the file.

@bdukes bdukes merged commit 8c89637 into dnnsoftware:release/9.4.x Oct 15, 2019
@bdukes bdukes added this to the 9.4.2 milestone Oct 15, 2019
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.

3 participants