This repository has been archived by the owner on Oct 6, 2019. It is now read-only.
Fix tab sorting before they are serialized #1134
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
david-poindexter
approved these changes
Aug 29, 2019
bdukes
approved these changes
Aug 29, 2019
|
@donker Is the intention for this to be held until 10.x? If not, can you rebase this to Release 3.0.x branch? |
I don't think it's too urgent since there is no UI for it right now. |
mitchelsellers
pushed a commit
that referenced
this pull request
Sep 26, 2019
* Update "About" information for DNN Platform to be more relevant and current (#1094) * Update to include relevant information and links for DNN Platform * Update local resource file to include new content * Update URLs to be absolute instead of using protocol-relative URLs * Moved UNSAFE_componentWillMount to componentDidMount * Fixed an issue where float where preventing collapsible height calculation * Prevents chrome autofill * Updates Dnn dependencies * DNN-31578 - Not listing deleted children in pages Parent dropdown (#1099) * Build front end projects in parallel using lerna (#1101) * Added lerna config * Sets up lerna to use yarn workspaces * Adds checksum for 9.4.0 Platform * Bumps version to 9.4.1 for next release (#1154) * Fix incorrect sites loaded (#1159) * DNN-33050 - Trigger reloadPortalList event with portalId and cultureCode * DNN-33050 - Invoke getPortalSettings with current selected portalId and cultureCode instead of getPortals which always point to current running portal - This is to load the correct portal settings based on user selection when view portal settings * DNN-29429: Move horizontal-line div tags after permission checks. (#1124) * Fix tab sorting before they are serialized (#1134) * DNN-32445 [Scheduler] Js error on changing scheduler server name (#1136) * In Admin Logs, allow <pre> tags to be styled (#1142) Fixes #1140 * Unable to set membership settings "Use Email Address as Username" ON (#1143) * Fix to display IP Filter settings correctly (#1146) * DNN-9532 - Fix to display IP Filter settings correctly - Code refactor and minor bugs listed below - Update state with the value from json response to ensure IP Filter object in UI is updated - Move specificityOptions and typeOptions initialization to constructor - Move all the validation of the form upon saving to reduce code complexity - Replace toggle option of RuleSpecificity to use const String of IP_RANGE and SINGLE_IP to make the code simpler and more readable - Move code to clear SubnetMask just before update to prevent SubnetMask become blank when user switch in between IP_RANGE and SINGLE_IP option * DNN-9532 - Remove unnecessary blank line * Modules get duplicated when try to localize modules (#1162) * DNN-31428 - Remove overflow property after closing PersonaBar (#1164) - revert to original style * () Characters that are not illegal are considered illegal characters (#1166) * Bumps Dnn dependencis to 9.4.0 release packages (#1169) * Fix for upgrade issues of Personabar in 9.4.0 (#1170) * Fix issues with upgrade of personabar to version 9.4.0 where old controllers were still in the DB and old packages were still registered * Update projects * Added message after localization update finishes (#1172) * Removed wrong rc0001 references in csproj
valadas
added a commit
that referenced
this pull request
Sep 29, 2019
* Update "About" information for DNN Platform to be more relevant and current (#1094) * Update to include relevant information and links for DNN Platform * Update local resource file to include new content * Update URLs to be absolute instead of using protocol-relative URLs * Moved UNSAFE_componentWillMount to componentDidMount * Fixed an issue where float where preventing collapsible height calculation * Prevents chrome autofill * Updates Dnn dependencies * DNN-31578 - Not listing deleted children in pages Parent dropdown (#1099) * Build front end projects in parallel using lerna (#1101) * Added lerna config * Sets up lerna to use yarn workspaces * Adds checksum for 9.4.0 Platform * Bumps version to 9.4.1 for next release (#1154) * Fix incorrect sites loaded (#1159) * DNN-33050 - Trigger reloadPortalList event with portalId and cultureCode * DNN-33050 - Invoke getPortalSettings with current selected portalId and cultureCode instead of getPortals which always point to current running portal - This is to load the correct portal settings based on user selection when view portal settings * DNN-29429: Move horizontal-line div tags after permission checks. (#1124) * Fix tab sorting before they are serialized (#1134) * DNN-32445 [Scheduler] Js error on changing scheduler server name (#1136) * In Admin Logs, allow <pre> tags to be styled (#1142) Fixes #1140 * Unable to set membership settings "Use Email Address as Username" ON (#1143) * Fix to display IP Filter settings correctly (#1146) * DNN-9532 - Fix to display IP Filter settings correctly - Code refactor and minor bugs listed below - Update state with the value from json response to ensure IP Filter object in UI is updated - Move specificityOptions and typeOptions initialization to constructor - Move all the validation of the form upon saving to reduce code complexity - Replace toggle option of RuleSpecificity to use const String of IP_RANGE and SINGLE_IP to make the code simpler and more readable - Move code to clear SubnetMask just before update to prevent SubnetMask become blank when user switch in between IP_RANGE and SINGLE_IP option * DNN-9532 - Remove unnecessary blank line * Modules get duplicated when try to localize modules (#1162) * DNN-31428 - Remove overflow property after closing PersonaBar (#1164) - revert to original style * () Characters that are not illegal are considered illegal characters (#1166) * Bumps Dnn dependencis to 9.4.0 release packages (#1169) * Fix for upgrade issues of Personabar in 9.4.0 (#1170) * Fix issues with upgrade of personabar to version 9.4.0 where old controllers were still in the DB and old packages were still registered * Update projects * Added message after localization update finishes (#1172) * DNN-31960 Expand/Collapse All Fails After Moving Dragging Away The Only Child Item (#1176) * DNN-28054 Expand All Fails After Adding Multiple Pages (#1175) * Store date in "round-trip" format (#1179) * Add missing keys for data consent (#1180)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1133
Summary
The tabs Hashtable is being built while exporting the portal's tabs. Further down the code the tab's parent is expected to be in the tabs Hashtable. If this fails the export stops. With the current sorting a newer tab (i.e. higher tabid) as a parent of an older tab (lower tabid) will cause this process to fail. Sorting should be on level, not tabid.