Skip to content
Snippets Groups Projects
Commit 6f877cef authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'cherry-pick-2cfcc52a' into 'esap-gui-dev'

Cherry picking 'keyword search' from voutsinas branch into dev branch

See merge request !8
parents 09b79d28 e12372fe
Branches
No related tags found
2 merge requests!9merge esap-gui-dev into master,!8Cherry picking 'keyword search' from voutsinas branch into dev branch
version: '3'
networks:
esap_net:
services:
esap_api:
image:
"esap_api:latest"
read_only:
false
volumes:
- /data/shared:/shared
networks:
- esap_net
ports:
- "8005:8005"
my_nginx:
image:
"my_nginx:latest"
read_only:
false
volumes:
- /data/shared:/shared
- /data/shared:/etc/nginx/conf.d/
- /data/shared/static:/static
networks:
- esap_net
ports:
- "80:80"
depends_on:
- esap_api
...@@ -101,6 +101,15 @@ export default function QueryArchives(props) { ...@@ -101,6 +101,15 @@ export default function QueryArchives(props) {
queryToStore[key]=value queryToStore[key]=value
} }
if (formData.keyword) {
key = "keyword"
value = formData.keyword.trim()
query = query + "&" + key + "=" + value
queryToStore[key]=value
}
if (formData.target) { if (formData.target) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment