SAK-30060: Upon site creation, don't show message about unpublished s…

…ite from template if it's set to be published
pushyamig · Nov 10, 2015 · fbc37d2 · fbc37d2
1 parent 6b02a16
commit fbc37d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 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
@@ -3348,6 +3348,7 @@ public int compare(String s1, String s2) {
 			 */
 
 			context.put("basedOnTemplate",  state.getAttribute(STATE_TEMPLATE_SITE) != null ? Boolean.TRUE:Boolean.FALSE);
+			context.put("publishTemplate", (Boolean) state.getAttribute(STATE_TEMPLATE_PUBLISH));
 
 			// bjones86 - SAK-21706
 			context.put( CONTEXT_SKIP_COURSE_SECTION_SELECTION, 
@@ -3430,6 +3431,7 @@ public int compare(String s1, String s2) {
 					"roster.available.weeks.before.term.start", "0"));
 
 			context.put("basedOnTemplate",  state.getAttribute(STATE_TEMPLATE_SITE) != null ? Boolean.TRUE:Boolean.FALSE);
+			context.put("publishTemplate", (Boolean) state.getAttribute(STATE_TEMPLATE_PUBLISH));
 
 			context.put("requireAuthorizer", ServerConfigurationService.getString(SAK_PROP_REQUIRE_AUTHORIZER, "true").equals("true")?Boolean.TRUE:Boolean.FALSE);
 

diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
@@ -345,7 +345,7 @@ function redirectBasedOnSelection(){
 					<a href="#" onclick="javascript:submitFindCourse();">$tlang.getString('nscourse.add_course_not_listed')</a>
 				#end
 				## if site creation is based on template, this could be the final step!
-				#if ($!basedOnTemplate) 
+				#if ($!basedOnTemplate && !$publishTemplate) 
 					<div class="instruction" id ="nextInstructions">
 						<span id="templateNonCourseInstruction" style="display:block">$tlang.getString("sitetype.templatefinalstepinstruction")</span>
 					</div>

diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourseManual.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourseManual.vm
@@ -207,7 +207,7 @@
 			<input type="hidden" name="templateIndex" value="$!templateIndex" />
 			<input type="hidden" name="continue" value="4" />
 			## if site creation is based on template, this could be the final step!
-			#if ($!basedOnTemplate) 
+			#if ($!basedOnTemplate && !$publishTemplate) 
 				<div class="instruction" id ="nextInstructions">
 					<span id="templateNonCourseInstruction" style="display:block">$tlang.getString("sitetype.templatefinalstepinstruction")</span>
 				</div>