SAK-32326 make sure additionalInfo (specialInstructions) persists whe…

…n using findCourse workflow (sakaiproject#4082)
OTEMA · Mar 14, 2017 · 1d525ce · 1d525ce
1 parent 8142a85
commit 1d525ce
Showing 1 changed file with 8 additions and 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
@@ -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))