Commit 3a4f05c4 authored by Matija Obreza's avatar Matija Obreza

Merge branch '330-apiinfocontroller-v1' into 'master'

Resolve "ApiInfoController v1"

Closes #330

See merge request genesys-pgr/genesys-server!232
parents 989af0fd 0236579e
......@@ -48,6 +48,15 @@ public class ApiInfoController {
@Value("${cdn.servers}")
private String[] cdnServers;
@Value("${captcha.siteKey}")
private String captchaSiteKey;
@Value("${google.analytics.account}")
private String googleAnalyticsId;
@Value("${itpgrfa.glis.basepath}")
private String glisUrl;
@Autowired
private AccessionService accessionService;
@Autowired
......@@ -80,6 +89,9 @@ public class ApiInfoController {
apiInfo.instituteCount = instituteService.countActive();
apiInfo.descriptorCount = descriptorService.countDescriptors(new DescriptorFilter().state(PublishState.PUBLISHED));
apiInfo.partnerCount = partnerService.countPartners(new PartnerFilter());
apiInfo.captchaSiteKey = this.captchaSiteKey;
apiInfo.googleAnalyticsId = this.googleAnalyticsId;
apiInfo.glisUrl = this.glisUrl;
return apiInfo;
}
......@@ -100,6 +112,9 @@ public class ApiInfoController {
public long instituteCount;
public long descriptorCount;
public long partnerCount;
public String captchaSiteKey;
public String googleAnalyticsId;
public String glisUrl;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment