Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
civitas-digitalis
platform
Commits
bba403bf
Commit
bba403bf
authored
Jun 08, 2018
by
Elias Englmeier
Browse files
getIdeasByUserIdProjectRef now returns all Idaes if pid is zero
parent
642082d0
Changes
2
Show whitespace changes
Inline
Side-by-side
modules/ideaService/ideaService-service/bin/ideaService/service/impl/IdeasLocalServiceImpl.class
View file @
bba403bf
No preview for this file type
modules/ideaService/ideaService-service/src/main/java/ideaService/service/impl/IdeasLocalServiceImpl.java
View file @
bba403bf
...
@@ -85,7 +85,7 @@ public class IdeasLocalServiceImpl extends IdeasLocalServiceBaseImpl {
...
@@ -85,7 +85,7 @@ public class IdeasLocalServiceImpl extends IdeasLocalServiceBaseImpl {
public
List
<
Ideas
>
getIdeasByUserRoleProjectId
(
String
role
,
long
userId
,
long
projectId
){
public
List
<
Ideas
>
getIdeasByUserRoleProjectId
(
String
role
,
long
userId
,
long
projectId
){
ArrayList
<
Ideas
>
result
=
new
ArrayList
<
Ideas
>();
ArrayList
<
Ideas
>
result
=
new
ArrayList
<
Ideas
>();
for
(
Ideas
i
:
IdeasUtil
.
findAll
()){
for
(
Ideas
i
:
IdeasUtil
.
findAll
()){
if
(
i
.
getProjectRef
()
==
projectId
){
if
(
projectId
==
0L
||
i
.
getProjectRef
()
==
projectId
){
if
((
role
.
equals
(
RoleConstants
.
ADMINISTRATOR
)
||
role
.
equals
(
RoleConstants
.
PORTAL_CONTENT_REVIEWER
))
if
((
role
.
equals
(
RoleConstants
.
ADMINISTRATOR
)
||
role
.
equals
(
RoleConstants
.
PORTAL_CONTENT_REVIEWER
))
&&
!
i
.
getReviewStatus
().
equals
(
ReviewStatus
.
SAVED
.
getReviewStatusDescription
())){
&&
!
i
.
getReviewStatus
().
equals
(
ReviewStatus
.
SAVED
.
getReviewStatusDescription
())){
result
.
add
(
i
);
result
.
add
(
i
);
...
@@ -93,9 +93,6 @@ public class IdeasLocalServiceImpl extends IdeasLocalServiceBaseImpl {
...
@@ -93,9 +93,6 @@ public class IdeasLocalServiceImpl extends IdeasLocalServiceBaseImpl {
else
if
(
i
.
getUserId
()
==
userId
){
else
if
(
i
.
getUserId
()
==
userId
){
result
.
add
(
i
);
result
.
add
(
i
);
}
}
// else if (i.getReviewStatus().equals(ReviewStatus.ACCEPTED.getReviewStatusDescription())){
// result.add(i);
// }
}
}
}
}
return
result
;
return
result
;
...
...
Write
Preview
Supports
Markdown
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