accurator/commit

Fallback on generic domain.

authorChris Dijkshoorn
Mon Jun 13 16:22:47 2016 +0200
committerChris Dijkshoorn
Mon Jun 13 16:22:47 2016 +0200
commit032bf3c21eac144603fc64c6260febf1505dddf9
treea4d5726fee19a2906cca03168837c037be168e31
parent40a9dd178fef7bbc979b667f1cd7974aedfc1edd
Diff style: patch stat
diff --git a/lib/accurator/domain.pl b/lib/accurator/domain.pl
index 403b7f3..a13aa6c 100644
--- a/lib/accurator/domain.pl
+++ b/lib/accurator/domain.pl
@@ -20,8 +20,12 @@ get_domain_settings(Dic, Options) :-
 get_domain_settings(Dic, Options) :-
 	option(domain(Domain), Options),
 	rdf(DomainUri, rdf:type, accu:'Domain'),
-	rdf(DomainUri, rdfs:label, literal(Domain)),
+	rdf(DomainUri, rdfs:label, literal(Domain)), !,
 	get_domain_dic(DomainUri, Domain, Dic).
+get_domain_settings(Dic, _Options) :-
+	rdf(DomainUri, rdf:type, accu:'Domain'),
+	rdf(DomainUri, rdfs:label, literal(generic)), !,
+	get_domain_dic(DomainUri, generic, Dic).
 
 %%	get_root_domains(+Domain, -RootDomains)
 %
diff --git a/web/js/intro.js b/web/js/intro.js
index 75dbac3..3f4beb6 100644
--- a/web/js/intro.js
+++ b/web/js/intro.js
@@ -21,6 +21,9 @@ function introInit() {
 		return domainSettings(domain);
 	})
 	.then(function(domainSettings) {
+		// fall back to returned (generic) domain if current domain setting is not present on server
+		if (domainSettings.domain != domain) setDomain(domainSettings.domain);
+
 		var ui = getUI(domainSettings, "intro");
 		setBackground(domainSettings.image, domainSettings.imageBrightness);
 		return getLabels(locale, ui);