SAK-32770 set a default value for tool_consumer_instance_guid (sakaip…

…roject#4686)
rifqioe · Aug 22, 2017 · 0ecf9b7 · 0ecf9b7
1 parent 43d48e1
commit 0ecf9b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java b/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java
@@ -707,7 +707,7 @@ public static void addGlobalData(Site site, Properties props, Properties custom,
 
 		// Get the organizational information
 		setProperty(props,BasicLTIConstants.TOOL_CONSUMER_INSTANCE_GUID, 
-				ServerConfigurationService.getString("basiclti.consumer_instance_guid",null));
+				ServerConfigurationService.getString("basiclti.consumer_instance_guid", ServerConfigurationService.getString("serverName", null)));
 		setProperty(props,BasicLTIConstants.TOOL_CONSUMER_INSTANCE_NAME, 
 				ServerConfigurationService.getString("basiclti.consumer_instance_name",null));
 		setProperty(props,BasicLTIConstants.TOOL_CONSUMER_INSTANCE_DESCRIPTION, 
@@ -1389,7 +1389,7 @@ public static String[] postLaunchHTML(Properties toolProps, Properties ltiProps,
 		if ( launch_url == null ) launch_url = toolProps.getProperty("launch_url");
 		if ( launch_url == null ) return postError("<p>" + getRB(rb, "error.missing" ,"Not configured")+"</p>");
 
-		String org_guid = ServerConfigurationService.getString("basiclti.consumer_instance_guid",null);
+		String org_guid = ServerConfigurationService.getString("basiclti.consumer_instance_guid", ServerConfigurationService.getString("serverName", null));
 		String org_desc = ServerConfigurationService.getString("basiclti.consumer_instance_description",null);
 		String org_url = ServerConfigurationService.getString("basiclti.consumer_instance_url",null);
 

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
@@ -2046,8 +2046,8 @@
 # DEFAULT: none (null)
 # basiclti.consumer_instance_description=
 
-# DEFAULT: none (null)
-# basiclti.consumer_instance_guid=
+# DEFAULT: serverName 
+# basiclti.consumer_instance_guid=lmsng.school.edu
 
 # DEFAULT: none (null)
 # basiclti.consumer_instance_name=