Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dariah
search
Commits
225cb94c
Commit
225cb94c
authored
Jul 19, 2021
by
Gradl, Tobias
Browse files
441: Fix issues related to deployment of upcoming v4-release (OPENED)
Task-Url:
#441
parent
8e0b509d
Pipeline
#25625
passed with stage
in 40 seconds
Changes
5
Pipelines
1
Show whitespace changes
Inline
Side-by-side
build.gradle
View file @
225cb94c
...
...
@@ -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
()
...
...
search-core/src/main/java/eu/dariah/de/search/config/nested/ApiServiceConfigProperties.java
View file @
225cb94c
package
eu.dariah.de.search.config.nested
;
import
eu.dariah.de.search.exceptions.ConfigurationException
;
import
lombok.Data
;
@Data
...
...
search-core/src/main/java/eu/dariah/de/search/controller/search/SimpleSearchController.java
View file @
225cb94c
...
...
@@ -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
();
...
...
search-ui/src/main/resources/application.yml
View file @
225cb94c
...
...
@@ -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/
...
...
resources
@
65f0ef80
Compare
af2a4c85
...
65f0ef80
Subproject commit
af2a4c85bcf339986256c41090cbf4fac7c4aaa2
Subproject commit
65f0ef804983df6409aaee4e879f673f7edb67ac
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment