SAK-26299 - Contributed patch - Add a site throws NPE in Preferences …

…notifications if tool is added to no term property git-svn-id: https://source.sakaiproject.org/svn/user/trunk@310467 66ffb92e-73f9-0310-93c1-f5514f145a0a
ferris001 · Jun 27, 2014 · 80249af · 80249af
1 parent ee78942
commit 80249af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties
@@ -38,6 +38,7 @@ moresite_portfolios = PORTFOLIOS
 moresite_administration = ADMINISTRATION
 moresite_other = OTHER
 moresite_scs = SCS Courses
+moresite_no_term = COURSES WITH NO TERM
 
 noti_prefs_title=Override {0} Preferences: Add Site(s)
 noti_prefs_instr=To override the default setting for specific site(s), check the box next to the site(s) \

diff --git a/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java b/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java
@@ -2441,6 +2441,7 @@ private String getSiteTypeDisplay(Site site) {
 		if ("course".equals(type))
 		{
 			term = siteProperties.getProperty("term");
+			if (term==null) term = msgs.getString("moresite_no_term","");
 		}
 		else if ("project".equals(type))
 		{