From 1d525ce28161d5eb755018cd7bcb1e8968265f2d Mon Sep 17 00:00:00 2001 From: Sam Ottenhoff Date: Tue, 14 Mar 2017 11:29:41 -0400 Subject: [PATCH] SAK-32326 make sure additionalInfo (specialInstructions) persists when using findCourse workflow (#4082) --- .../java/org/sakaiproject/site/tool/SiteAction.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 index 63180ac8c44a..8df2dd09e279 100644 --- 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 @@ -3660,8 +3660,7 @@ public int compare(String s1, String s2) { int cmLevelSize = 0; - if (cms == null || !courseManagementIsImplemented() - || cmLevels == null || cmLevels.size() < 1) { + if (cms == null || !courseManagementIsImplemented() || cmLevels == null || cmLevels.size() < 1) { // TODO: redirect to manual entry: case #37 } else { cmLevelSize = cmLevels.size(); @@ -15046,10 +15045,15 @@ public void doFind_course(RunData data) { { if ("continue".equals(option)) { - String uniqname = StringUtils.trimToNull(params - .getString("uniqname")); + String uniqname = StringUtils.trimToNull(params.getString("uniqname")); state.setAttribute(STATE_SITE_QUEST_UNIQNAME, uniqname); + SiteInfo siteInfo = state.getAttribute(STATE_SITE_INFO) != null? (SiteInfo) state.getAttribute(STATE_SITE_INFO):new SiteInfo(); + if (params.getString("additional") != null) { + siteInfo.additional = params.getString("additional"); + } + state.setAttribute(STATE_SITE_INFO, siteInfo); + if (state.getAttribute(STATE_FUTURE_TERM_SELECTED) != null && !((Boolean) state .getAttribute(STATE_FUTURE_TERM_SELECTED))