Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
basic
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
xrm
basic
Commits
5054dcfa
Commit
5054dcfa
authored
5 years ago
by
Johannes Hörmann
Browse files
Options
Downloads
Patches
Plain Diff
bugfix bei Modulen in 360 grad ohne aktiv-status
parent
edf47623
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
process/Context_lib/process.js
+15
-5
15 additions, 5 deletions
process/Context_lib/process.js
with
15 additions
and
5 deletions
process/Context_lib/process.js
+
15
−
5
View file @
5054dcfa
...
...
@@ -595,7 +595,13 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
dateColumn
=
"
,
"
+
(
ownContextSelector
.
getFullField
(
ownContextSelector
.
creationDateField
)
||
"
''
"
);
var
stateColumn
=
""
;
if
(
pWithState
===
true
)
stateColumn
=
"
,
"
+
(
ownContextSelector
.
getFullField
(
ownContextSelector
.
stateField
)
||
"
''
"
);
{
if
(
ownContextSelector
.
stateField
)
stateColumn
=
"
,
"
+
(
ownContextSelector
.
getFullField
(
ownContextSelector
.
stateField
)
||
"
''
"
);
else
stateColumn
=
"
, ''
"
;
}
var
contextDataSelect
=
newSelect
(
ownContextSelector
.
getFullIdField
()
+
"
,
"
+
ownContextSelector
.
titleExpression
+
dateColumn
+
stateColumn
)
...
...
@@ -615,10 +621,14 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
var
condSub
=
newWhere
();
activeStates
.
forEach
(
function
(
state
)
{
if
(
pActive
)
condSub
.
or
(
ownContextSelector
.
getFullField
(
ownContextSelector
.
stateField
),
state
)
else
condSub
.
and
(
ownContextSelector
.
getFullField
(
ownContextSelector
.
stateField
),
state
,
"
# != ?
"
)
if
(
ownContextSelector
.
stateField
)
{
if
(
pActive
)
condSub
.
or
(
ownContextSelector
.
getFullField
(
ownContextSelector
.
stateField
),
state
)
else
condSub
.
and
(
ownContextSelector
.
getFullField
(
ownContextSelector
.
stateField
),
state
,
"
# != ?
"
)
}
});
contextDataSelect
.
andIfSet
(
condSub
);
}
...
...
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