Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
e5685df2
Commit
e5685df2
authored
4 years ago
by
Juan Fuentes
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-10300 : Bugfix, fullPropertyName should be null for any property
parent
bec03bf5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java
+10
-4
10 additions, 4 deletions
...nslator/condition/DateFieldSearchConditionTranslator.java
with
10 additions
and
4 deletions
openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java
+
10
−
4
View file @
e5685df2
...
...
@@ -106,13 +106,13 @@ public class DateFieldSearchConditionTranslator implements IConditionTranslator<
case
PROPERTY:
{
translateDateProperty
(
criterion
,
tableMapper
,
args
,
sqlBuilder
,
aliases
,
dataTypeByPropertyCode
);
translateDateProperty
(
criterion
,
tableMapper
,
args
,
sqlBuilder
,
aliases
,
dataTypeByPropertyCode
,
false
);
break
;
}
case
ANY_PROPERTY:
{
translateDateProperty
(
criterion
,
tableMapper
,
args
,
sqlBuilder
,
aliases
,
dataTypeByPropertyCode
);
translateDateProperty
(
criterion
,
tableMapper
,
args
,
sqlBuilder
,
aliases
,
dataTypeByPropertyCode
,
true
);
break
;
}
...
...
@@ -125,9 +125,15 @@ public class DateFieldSearchConditionTranslator implements IConditionTranslator<
private
static
void
translateDateProperty
(
final
DateFieldSearchCriteria
criterion
,
final
TableMapper
tableMapper
,
final
List
<
Object
>
args
,
final
StringBuilder
sqlBuilder
,
final
Map
<
String
,
JoinInformation
>
aliases
,
final
Map
<
String
,
String
>
dataTypeByPropertyCode
)
final
Map
<
String
,
String
>
dataTypeByPropertyCode
,
boolean
isAnyProperty
)
{
final
String
fullPropertyName
=
criterion
.
getFieldName
();
final
String
fullPropertyName
;
if
(
isAnyProperty
)
{
fullPropertyName
=
null
;
}
else
{
fullPropertyName
=
criterion
.
getFieldName
();
}
final
IDate
value
=
criterion
.
getFieldValue
();
final
ITimeZone
timeZone
=
criterion
.
getTimeZone
();
final
boolean
bareDateValue
=
value
instanceof
AbstractDateValue
&&
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment