Commit 5b56387e authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Merge branch 'v4.2-dev' into 'v4.x-master'

441: Fix issues related to deployment of upcoming v4-release (OPENED)

See merge request !30
parents 473423bf 225cb94c
Pipeline #25627 passed with stages
in 4 minutes and 7 seconds
......@@ -9,7 +9,7 @@ allprojects {
apply plugin: 'eclipse'
group = 'eu.dariah.de.minfba'
version = '4.3.2-SNAPSHOT'
version = '4.3.3-SNAPSHOT'
repositories {
mavenLocal()
......
package eu.dariah.de.search.config.nested;
import eu.dariah.de.search.exceptions.ConfigurationException;
import lombok.Data;
@Data
......
......@@ -40,6 +40,10 @@ public class SimpleSearchController extends BaseSimpleSearchController {
@GetMapping(value="/")
public ModelAndView getViewAndQuery(@RequestParam(required=false, name="q") String expression, @RequestParam(required=false, name="sourceId") List<String> sourceIds, RedirectAttributes attributes, Model model, HttpServletRequest request, Locale locale) {
// After search is executed from homescreen
if (model.asMap().containsKey("redirectExpression") && model.asMap().get("redirectExpression")!=null) {
expression = (String)model.asMap().get("redirectExpression");
}
List<String> notifications = new ArrayList<>();
List<Collection> collections = collectionService.getAll();
......
......@@ -58,6 +58,9 @@ api:
colreg:
#base_url: https://teaching.clariah.de/colreg-ui/
base_url: http://localhost:8081/
#autosync: false
#syncInterval: 3600
#timeout: 300
dme:
base_url: https://teaching.clariah.de/dme/
......
Subproject commit af2a4c85bcf339986256c41090cbf4fac7c4aaa2
Subproject commit 65f0ef804983df6409aaee4e879f673f7edb67ac
Supports Markdown
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