From 1c86f5bd842ae2c39e7fc9c000abf6c6d6a8961c Mon Sep 17 00:00:00 2001 From: Fabian Peters Date: Fri, 6 Nov 2015 13:52:58 +0100 Subject: [PATCH] Don't push computed tabSectionContents to the d2wContext as this may cause stale values to be used. E.g. when switching from inspect to edit causes the displayPropertyKeys to change. For the same reason, reset _currentTab when clearTabSectionsContents is called. --- .../ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java index 0a148e0fada..eeb763aa93c 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java @@ -953,7 +953,6 @@ public NSArray tabSectionsContents() { _tabSectionsContents = tabSectionsContentsFromRuleResult(tabSectionContentsFromRule); ERXStats.markEnd("D2W", statsKey); - d2wContext().takeValueForKey(tabSectionContentsFromRule, "tabSectionsContents"); // Once calculated we then determine any displayNameForTabKey String currentTabKey = (String) d2wContext().valueForKey(Keys.tabKey); for (Enumeration e = _tabSectionsContents.objectEnumerator(); e.hasMoreElements();) { @@ -977,6 +976,7 @@ public NSArray tabSectionsContents() { */ protected void clearTabSectionsContents() { _tabSectionsContents = null; + _currentTab = null; } /** Dummy denoting to sections. */