SAK-32067 - Change default value of site-manage.importoption.siteinfo…

… to true (sakaiproject#3738)
vaibhav-s · Jan 5, 2017 · 0d369a9 · 0d369a9
1 parent 8c6d61d
commit 0d369a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -1600,6 +1600,10 @@
 # DEFAULT: false
 # wsetup.skipManualCourseCreation=true
 
+# SAK-22437 Add Site Information Display (site description) to site import options list
+# DEFAULT: true
+# site-manage.importoption.siteinfo=false
+
 # ########################################################################
 # GROUP PROVIDER (defined in kernel.properties)
 # ########################################################################

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
@@ -13865,7 +13865,7 @@ protected Set importTools() {
 			}
 		}
 
-		if (ServerConfigurationService.getBoolean("site-manage.importoption.siteinfo", false)){
+		if (ServerConfigurationService.getBoolean("site-manage.importoption.siteinfo", true)){
 			rv.add(SITE_INFO_TOOL_ID);
 		}
 
@@ -13919,7 +13919,7 @@ protected List getToolsAvailableForImport(SessionState state, List<String> toolI
 			toolIdList.add(NEWS_TOOL_ID);
 		if (displayLessons && !toolIdList.contains(LESSONS_TOOL_ID))
 			toolIdList.add(LESSONS_TOOL_ID);
-		if (ServerConfigurationService.getBoolean("site-manage.importoption.siteinfo", false)){
+		if (ServerConfigurationService.getBoolean("site-manage.importoption.siteinfo", true)){
 			toolIdList.add(SITE_INFO_TOOL_ID);
 		}