Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
C
core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
91
Issues
91
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
minerva
core
Commits
7e9cb567
Commit
7e9cb567
authored
Jun 03, 2020
by
Piotr Gawron
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1243-submap-id' into 'devel_14.0.x'
verify that submap exists See merge request
!1158
parents
edeb95e8
8d030c8e
Pipeline
#29119
passed with stage
in 17 minutes and 10 seconds
Changes
2
Pipelines
29
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
CHANGELOG
CHANGELOG
+2
-0
frontend-js/src/main/js/minerva.js
frontend-js/src/main/js/minerva.js
+11
-7
No files found.
CHANGELOG
View file @
7e9cb567
...
...
@@ -6,6 +6,8 @@ minerva (14.0.13) stable; urgency=medium
*
Bug
fix
:
creating
comment
with
too
long
name
/
email
resulted
in
Internal
Server
Error
-
now
the
proper
error
message
is
returned
(#
1245
)
*
Bug
fix
:
user
cannot
put
too
long
name
in
a
comment
dialog
(#
1245
)
*
Bug
fix
:
when
url
contained
invalid
submap
id
unhandled
error
was
raised
(#
1243
)
--
Piotr
Gawron
<
piotr
.
gawron
@
uni
.
lu
>
Wed
,
3
Jun
2020
17
:
00
:
00
+
0200
...
...
frontend-js/src/main/js/minerva.js
View file @
7e9cb567
...
...
@@ -54,13 +54,17 @@ function processUrlGetParams(params) {
}
var
model
=
project
.
getModelById
(
modelId
);
if
(
model
!==
null
)
{
if
(
GuiConnector
.
getParams
[
"
x
"
]
!==
undefined
&&
GuiConnector
.
getParams
[
"
y
"
]
!==
undefined
)
{
var
point
=
new
Point
(
GuiConnector
.
getParams
[
"
x
"
],
GuiConnector
.
getParams
[
"
y
"
]);
sessionData
.
setCenter
(
model
,
point
);
}
if
(
GuiConnector
.
getParams
[
"
zoom
"
]
!==
undefined
)
{
sessionData
.
setZoomLevel
(
model
,
GuiConnector
.
getParams
[
"
zoom
"
]);
if
(
GuiConnector
.
getParams
[
"
x
"
]
!==
undefined
&&
GuiConnector
.
getParams
[
"
y
"
]
!==
undefined
)
{
var
point
=
new
Point
(
GuiConnector
.
getParams
[
"
x
"
],
GuiConnector
.
getParams
[
"
y
"
]);
sessionData
.
setCenter
(
model
,
point
);
}
if
(
GuiConnector
.
getParams
[
"
zoom
"
]
!==
undefined
)
{
sessionData
.
setZoomLevel
(
model
,
GuiConnector
.
getParams
[
"
zoom
"
]);
}
}
else
{
logger
.
warn
(
"
Model with given ID does not exist:
"
+
modelId
);
}
if
(
GuiConnector
.
getParams
[
"
background
"
]
!==
undefined
)
{
...
...
@@ -580,7 +584,7 @@ function create(params) {
}).
then
(
function
()
{
var
submapId
=
GuiConnector
.
getParams
[
"
submap
"
];
if
(
submapId
!==
undefined
)
{
if
(
submapId
!==
undefined
&&
customMap
.
getSubmapById
(
submapId
)
!==
null
)
{
return
customMap
.
openSubmap
(
submapId
);
}
}).
then
(
function
()
{
...
...
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