Merge pull request sakaiproject#267 from bkirschn/master

SAK-29136 fix regression creating new sites
abdobaz · Mar 9, 2015 · 5dac9fe · 5dac9fe
2 parents 595b058 + 1f18581
commit 5dac9fe
Showing 1 changed file with 9 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
@@ -3672,7 +3672,10 @@ private void buildLTIToolContextForTemplate(Context context,
 		List<Map<String, Object>> visibleTools, allTools;
 		// get the visible and all (including stealthed) list of lti tools
 		visibleTools = m_ltiService.getTools(null,null,0,0);
-		allTools     = m_ltiService.getToolsDao(null,null,0,0,site.getId());
+		if (site == null)
+			allTools = visibleTools;
+		else
+			allTools = m_ltiService.getToolsDao(null,null,0,0,site.getId());
 
 		if (visibleTools != null && !visibleTools.isEmpty())
 		{
@@ -6132,7 +6135,11 @@ private List getUngroupedTools(String ungroupedName, Map<String,List> toolsByGro
 	private List getLtiToolGroup(String groupName, File moreInfoDir, Site site) {
 		List ltiSelectedTools = selectedLTITools(site);
 		List ltiTools = new ArrayList();
-		List<Map<String, Object>> allTools     = m_ltiService.getToolsDao(null,null,0,0,site.getId());
+		List<Map<String, Object>> allTools;
+		if ( site == null )
+			allTools = m_ltiService.getTools(null,null,0,0);
+		else
+			allTools = m_ltiService.getToolsDao(null,null,0,0,site.getId());
 
 		if (allTools != null && !allTools.isEmpty()) {
 			for (Map<String, Object> tool : allTools) {