SAK-33850 Making sure create site from archive is cancelled (sakaipro…

…ject#5293) * SAK-33850 Making sure create site from archive is cancelled * Adding to cleanState * Wrong variable
susowrc · Feb 9, 2018 · a184e28 · a184e28
1 parent e4e9f9c
commit a184e28
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
@@ -1202,6 +1202,8 @@ private void cleanState(SessionState state) {
 
 		// SAK-24423 - remove joinable site settings from the state
 		JoinableSiteSettings.removeJoinableSiteSettingsFromState( state );
+
+		state.removeAttribute(STATE_CREATE_FROM_ARCHIVE);
 
 	} // cleanState
 
@@ -7548,6 +7550,8 @@ public void doCancel_create(RunData data) {
 		} else {
 			state.setAttribute(STATE_TEMPLATE_INDEX, "0");
 		}
+
+		state.setAttribute(STATE_CREATE_FROM_ARCHIVE, Boolean.FALSE);
 
 		resetVisitedTemplateListToIndex(state, (String) state.getAttribute(STATE_TEMPLATE_INDEX));