Skip to content
Snippets Groups Projects
Commit 1a8a0369 authored by srosse's avatar srosse
Browse files

OO-918: better check the configuration

parent bfa9075b
No related branches found
No related tags found
No related merge requests found
...@@ -94,14 +94,18 @@ public class CourseSiteDef extends AbstractSiteDefinition implements SiteDefinit ...@@ -94,14 +94,18 @@ public class CourseSiteDef extends AbstractSiteDefinition implements SiteDefinit
} }
LanguageConfiguration langConfig = getLanguageConfiguration(ureq, courseConfig); LanguageConfiguration langConfig = getLanguageConfiguration(ureq, courseConfig);
if(langConfig == null) {
return null;
}
String icon = courseConfig.getNavIconCssClass(); String icon = courseConfig.getNavIconCssClass();
return new CourseSite(this, ureq.getLocale(), langConfig.getRepoSoftKey(), showToolController, return new CourseSite(this, ureq.getLocale(), langConfig.getRepoSoftKey(), showToolController,
siteSecCallback, langConfig.getTitle(), icon); siteSecCallback, langConfig.getTitle(), icon);
} }
protected LanguageConfiguration getLanguageConfiguration(UserRequest ureq, CourseSiteConfiguration config) { protected LanguageConfiguration getLanguageConfiguration(UserRequest ureq, CourseSiteConfiguration config) {
if(config == null || config.getConfigurations() == null) return null;
String language = ureq.getUserSession().getLocale().getLanguage(); String language = ureq.getUserSession().getLocale().getLanguage();
LanguageConfiguration myLangConfig = null; LanguageConfiguration myLangConfig = null;
LanguageConfiguration defaultLangConfig = null; LanguageConfiguration defaultLangConfig = null;
for(LanguageConfiguration langConfig:config.getConfigurations()) { for(LanguageConfiguration langConfig:config.getConfigurations()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment