Project

General

Profile

« Previous | Next » 

Revision 60764

reverted to version 56067 - attempt to use relative URLs sadly failed

View differences:

VocabularyPublisherController.java
31 31
	private VocabularyRetriever vocabularyRetriever;
32 32
	@Value("${vocabulary.publisher.title}")
33 33
	private String title;
34
	@Value("${vocabulary.publisher.baseURL}")
35
	private String baseURL;
34 36
	@Value("${container.context}")
35 37
	private String context;
36 38

  
37

  
38 39
	@RequestMapping(value = "/vocabularies", method = RequestMethod.GET, produces = { "application/json" })
39 40
	public @ResponseBody
40 41
	List<Vocabulary> listVocabularies() {
......
72 73
	@RequestMapping(value = "/vocabularies", method = RequestMethod.GET, produces = { "text/html" })
73 74
	public void listVocabularies(final ModelMap map) {
74 75
		map.addAttribute("vocabularies", listVocabularies());
76
		map.addAttribute("title", title);
77
		map.addAttribute("baseURL", baseURL);
75 78
		map.addAttribute("context", context);
76
		map.addAttribute("title", title);
77 79
	}
78 80

  
79 81
	@RequestMapping(value = "/vocabularies/{code}", method = RequestMethod.GET, produces = { "text/html" })
......
82 84
			final ModelMap map) throws VocabularyNotFoundException {
83 85

  
84 86
		map.addAttribute("vocabulary", getVocabulary(code));
87
		map.addAttribute("baseURL", baseURL);
85 88
		map.addAttribute("context", context);
86 89
		return "displayVocabulary";
87 90
	}
......
93 96
			final ModelMap map) throws VocabularyNotFoundException {
94 97
		map.addAttribute("vocabulary", getVocabulary(code));
95 98
		map.addAttribute("term", getTermSynonyms(code, request));
99
		map.addAttribute("baseURL", baseURL);
96 100
		map.addAttribute("context", context);
97 101
		return "displaySynonyms";
98 102
	}

Also available in: Unified diff