Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
49b185da
Commit
49b185da
authored
Apr 03, 2019
by
Piotr Gawron
Browse files
proper project instance is used in rest API search calls
parent
619e9b96
Pipeline
#9626
failed with stage
in 19 minutes and 9 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
49b185da
...
...
@@ -3,6 +3,8 @@ minerva (12.2.2) stable; urgency=medium
with different id than default map was accessed
* Bug fix: change of owner of the data overlay in admin panel incorrectly
ordered overlays (#777)
* Bug fix: chemical search didn'
t
use
updated
disease
identifier
,
original
disease
id
from
project
upload
was
used
instead
(#
779
)
minerva
(
12.2.1
)
stable
;
urgency
=
medium
*
Bug
fix
:
export
of
reaction
colorsi
in
SBML
is
properly
encoded
(
COPASI
can
...
...
rest-api/src/main/java/lcsb/mapviewer/api/projects/chemicals/ChemicalRestImpl.java
View file @
49b185da
...
...
@@ -58,7 +58,7 @@ public class ChemicalRestImpl extends BaseRestImpl {
if
(
model
==
null
)
{
throw
new
QueryException
(
"Project with given id doesn't exist"
);
}
Project
project
=
model
.
getProject
(
);
Project
project
=
getProjectService
().
getProjectByProjectId
(
projectId
,
token
);
if
(
project
.
getDisease
()
==
null
)
{
throw
new
QueryException
(
"Project doesn't have disease associated to it"
);
}
...
...
@@ -175,7 +175,7 @@ public class ChemicalRestImpl extends BaseRestImpl {
if
(
model
==
null
)
{
throw
new
QueryException
(
"Project with given id doesn't exist"
);
}
Project
project
=
model
.
getProject
(
);
Project
project
=
getProjectService
().
getProjectByProjectId
(
projectId
,
token
);
if
(
project
.
getDisease
()
==
null
)
{
throw
new
QueryException
(
"Project doesn't have disease associated to it"
);
...
...
rest-api/src/main/java/lcsb/mapviewer/api/projects/drugs/DrugRestImpl.java
View file @
49b185da
...
...
@@ -54,7 +54,7 @@ public class DrugRestImpl extends BaseRestImpl {
if
(
model
==
null
)
{
throw
new
QueryException
(
"Project with given id doesn't exist"
);
}
Project
project
=
model
.
getProject
(
);
Project
project
=
getProjectService
().
getProjectByProjectId
(
projectId
,
token
);
Set
<
String
>
columnSet
=
createDrugColumnSet
(
columns
);
...
...
@@ -160,7 +160,7 @@ public class DrugRestImpl extends BaseRestImpl {
if
(
model
==
null
)
{
throw
new
QueryException
(
"Project with given id doesn't exist"
);
}
Project
project
=
model
.
getProject
(
);
Project
project
=
getProjectService
().
getProjectByProjectId
(
projectId
,
token
);
List
<
Model
>
models
=
getModels
(
projectId
,
"*"
,
token
);
...
...
rest-api/src/main/java/lcsb/mapviewer/api/projects/mirnas/MiRnaRestImpl.java
View file @
49b185da
...
...
@@ -53,7 +53,7 @@ public class MiRnaRestImpl extends BaseRestImpl {
if
(
model
==
null
)
{
throw
new
QueryException
(
"Project with given id doesn't exist"
);
}
Project
project
=
model
.
getProject
(
);
Project
project
=
getProjectService
().
getProjectByProjectId
(
projectId
,
token
);
Set
<
String
>
columnSet
=
createMiRnaColumnSet
(
columns
);
...
...
@@ -129,7 +129,7 @@ public class MiRnaRestImpl extends BaseRestImpl {
if
(
model
==
null
)
{
throw
new
QueryException
(
"Project with given id doesn't exist"
);
}
Project
project
=
model
.
getProject
(
);
Project
project
=
getProjectService
().
getProjectByProjectId
(
projectId
,
token
);
List
<
Model
>
models
=
getModels
(
projectId
,
"*"
,
token
);
...
...
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