D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minors

This commit is contained in:
Michele Artini 2022-12-02 11:10:15 +01:00
parent 066e0ca73c
commit 3aa5acd740
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainController.java
View File

@ -3,6 +3,7 @@ package eu.dnetlib.is;
import java.util.Optional; import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
@ -30,6 +31,9 @@ public class MainController {
@Autowired @Autowired
private ResourceTypeRepository resourceTypeRepository; private ResourceTypeRepository resourceTypeRepository;
@Value("${logging.file.name:not specified}")
private String logFile;
@GetMapping("/main") @GetMapping("/main")
public void mainPage() {} public void mainPage() {}
@ -78,7 +82,7 @@ public class MainController {
} }
@GetMapping("/info") @GetMapping("/info")
public void wfHistory(final ModelMap map) throws Exception {} public void wfHistory() throws Exception {}
@ModelAttribute("resTypes") @ModelAttribute("resTypes")
public Iterable<ResourceType> resourceTypes() { public Iterable<ResourceType> resourceTypes() {

4
apps/dnet-is-application/src/main/java/eu/dnetlib/is/info/InfoRestController.java
View File

@ -30,9 +30,11 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import eu.dnetlib.common.controller.AbstractDnetController;
@RestController @RestController
@RequestMapping("/api/info") @RequestMapping("/api/info")
public class InfoRestController { public class InfoRestController extends AbstractDnetController {
@Autowired @Autowired
private ConfigurableEnvironment configurableEnvironment; private ConfigurableEnvironment configurableEnvironment;

1
apps/dnet-is-application/src/main/resources/templates/info.html
View File

@ -57,7 +57,6 @@
app.controller('infoController', function($scope, $http) { app.controller('infoController', function($scope, $http) {
$scope.info = []; $scope.info = [];
$scope.modules = {};
$http.get('./api/info/?' + $.now()).then(function successCallback(res) { $http.get('./api/info/?' + $.now()).then(function successCallback(res) {
angular.forEach(res.data, function(section) { angular.forEach(res.data, function(section) {