Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Devrim Gunyel
core
Commits
0dee3ac4
Commit
0dee3ac4
authored
Jul 23, 2018
by
Piotr Gawron
Browse files
when there is no google api key defined parameter is not entered to the url
parent
d91774b1
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
0dee3ac4
minerva
(
11.1.3
)
stable
;
urgency
=
medium
*
Bug
fix
RPM
:
remove
directory
with
contents
of
unpacked
war
file
when
uninstalling
*
Bug
fix
:
don
't append Google API key to Google maps javascript URL
when it is not set
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 23 Jul 2018 16:00:00 +0200
minerva (11.1.2) stable; urgency=medium
* Bug fix: Searching for chemicals with invalid mesh ID crashed
* Bug fix: opening map that was removed and re-uploaded could crash
...
...
frontend-js/.idea/frontend-js.iml
View file @
0dee3ac4
...
...
@@ -11,5 +11,11 @@
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"library"
name=
"chai-DefinitelyTyped"
level=
"application"
/>
<orderEntry
type=
"library"
name=
"js-cookie-DefinitelyTyped"
level=
"application"
/>
<orderEntry
type=
"library"
name=
"@types/ol"
level=
"application"
/>
<orderEntry
type=
"library"
name=
"datatables.net-DefinitelyTyped"
level=
"application"
/>
<orderEntry
type=
"library"
name=
"jQuery UI-1.10.2"
level=
"application"
/>
<orderEntry
type=
"library"
name=
"jQuery-2.0.0"
level=
"application"
/>
<orderEntry
type=
"library"
name=
"mocha-DefinitelyTyped"
level=
"application"
/>
<orderEntry
type=
"library"
name=
"request-DefinitelyTyped"
level=
"application"
/>
</component>
</module>
\ No newline at end of file
frontend-js/src/main/js/minerva.js
View file @
0dee3ac4
...
...
@@ -518,7 +518,7 @@ function create(params) {
return
ServerConnector
.
getConfiguration
();
}).
then
(
function
(
configuration
)
{
params
.
setConfiguration
(
configuration
);
return
functions
.
loadScript
(
"
https://maps.google.com/maps/api/js?libraries=drawing&v=3.26&key=
"
+
configuration
.
getOption
(
ConfigurationType
.
GOOGLE_MAPS_API_KEY
));
return
functions
.
loadScript
(
"
https://maps.google.com/maps/api/js?libraries=drawing&v=3.26
"
+
(
configuration
.
getOption
(
ConfigurationType
.
GOOGLE_MAPS_API_KEY
)?
'
&key=
'
+
configuration
.
getOption
(
ConfigurationType
.
GOOGLE_MAPS_API_KEY
)
:
''
)
);
}).
then
(
function
()
{
return
getProject
(
params
);
}).
then
(
function
(
project
)
{
...
...
@@ -639,7 +639,7 @@ function createExport(params) {
return
ServerConnector
.
getConfiguration
();
}).
then
(
function
(
configuration
)
{
params
.
setConfiguration
(
configuration
);
return
functions
.
loadScript
(
"
https://maps.google.com/maps/api/js?libraries=drawing&v=3.26&key=
"
+
configuration
.
getOption
(
ConfigurationType
.
GOOGLE_MAPS_API_KEY
));
return
functions
.
loadScript
(
"
https://maps.google.com/maps/api/js?libraries=drawing&v=3.26
"
+
(
configuration
.
getOption
(
ConfigurationType
.
GOOGLE_MAPS_API_KEY
)?
'
&key=
'
+
configuration
.
getOption
(
ConfigurationType
.
GOOGLE_MAPS_API_KEY
)
:
''
)
);
}).
then
(
function
()
{
return
getProject
(
params
);
}).
then
(
function
(
project
)
{
...
...
persist/src/db/11.1.3/fix_db_20180723.sql
0 → 100644
View file @
0dee3ac4
-- empty file to force directory to be commited to git repo
web/src/main/webapp/login.xhtml
View file @
0dee3ac4
...
...
@@ -74,7 +74,7 @@
var
head
=
document
.
getElementsByTagName
(
'
head
'
)[
0
];
var
script
=
document
.
createElement
(
'
script
'
);
script
.
type
=
'
text/javascript
'
;
script
.
src
=
"
https://maps.google.com/maps/api/js?libraries=drawing&v=3.26&key=
"
+
configuration
.
getOption
(
"
GOOGLE_MAPS_API_KEY
"
);
script
.
src
=
"
https://maps.google.com/maps/api/js?libraries=drawing&v=3.26
"
+
(
configuration
.
getOption
(
"
GOOGLE_MAPS_API_KEY
"
)?
'
&key=
'
+
configuration
.
getOption
(
"
GOOGLE_MAPS_API_KEY
"
)
:
''
)
;
head
.
appendChild
(
script
);
});
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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