Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ADITO_Update_Upgrade
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
Gitlab Maintenance 28.03.2025 | 20:00 - 23:00 MEZ
Show more breadcrumbs
xrm
ADITO_Update_Upgrade
Commits
0a17d3d3
Commit
0a17d3d3
authored
5 years ago
by
Johannes Hörmann
Browse files
Options
Downloads
Patches
Plain Diff
fix support ticket behaviour if status whitelist is empty
parent
9b74c175
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
+12
-7
12 additions, 7 deletions
...ywordEntry_entity/recordcontainers/db/conditionProcess.js
process/Ticket_lib/process.js
+3
-2
3 additions, 2 deletions
process/Ticket_lib/process.js
with
15 additions
and
9 deletions
entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
+
12
−
7
View file @
0a17d3d3
...
@@ -10,13 +10,18 @@ if (vars.get("$param.OnlyActives_param") == "true")
...
@@ -10,13 +10,18 @@ if (vars.get("$param.OnlyActives_param") == "true")
cond
.
and
(
"
AB_KEYWORD_ENTRY.ISACTIVE
"
,
"
1
"
);
cond
.
and
(
"
AB_KEYWORD_ENTRY.ISACTIVE
"
,
"
1
"
);
}
}
if
(
vars
.
get
(
"
$param.ExcludedKeyIdsSubquery_param
"
))
if
(
vars
.
exists
(
"
$param.ExcludedKeyIdsSubquery_param
"
)
&&
vars
.
get
(
"
$param.ExcludedKeyIdsSubquery_param
"
))
{
cond
.
and
(
"
AB_KEYWORD_ENTRY.KEYID
"
,
"
(
"
+
vars
.
get
(
"
$param.ExcludedKeyIdsSubquery_param
"
)
+
"
)
"
,
"
not in ?
"
);
cond
.
and
(
"
AB_KEYWORD_ENTRY.KEYID not in (
"
+
vars
.
get
(
"
$param.ExcludedKeyIdsSubquery_param
"
)
+
"
)
"
);
}
if
(
vars
.
getString
(
"
$param.WhitelistIds_param
"
))
if
(
vars
.
getString
(
"
$param.WhitelistIds_param
"
))
cond
.
and
(
"
AB_KEYWORD_ENTRY.KEYID
"
,
JSON
.
parse
(
vars
.
getString
(
"
$param.WhitelistIds_param
"
)),
SqlBuilder
.
IN
());
{
var
whitelist
=
JSON
.
parse
(
vars
.
getString
(
"
$param.WhitelistIds_param
"
));
if
(
whitelist
.
length
>
0
)
cond
.
and
(
"
AB_KEYWORD_ENTRY.KEYID
"
,
JSON
.
parse
(
vars
.
getString
(
"
$param.WhitelistIds_param
"
)),
SqlBuilder
.
IN
());
else
cond
.
and
(
"
1=2
"
);
// force empty result if whitelist is empty
}
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
result
.
string
(
cond
.
toString
());
result
.
string
(
cond
.
translate
(
"
1 = 1
"
));
\ No newline at end of file
This diff is collapsed.
Click to expand it.
process/Ticket_lib/process.js
+
3
−
2
View file @
0a17d3d3
...
@@ -121,9 +121,10 @@ TicketUtils.prototype.getTypeAttributes = function()
...
@@ -121,9 +121,10 @@ TicketUtils.prototype.getTypeAttributes = function()
*/
*/
TicketUtils
.
prototype
.
getAvailableStatus
=
function
()
TicketUtils
.
prototype
.
getAvailableStatus
=
function
()
{
{
states
=
JSON
.
parse
(
KeywordUtils
.
getAttributeRelation
(
this
.
type
,
$KeywordRegistry
.
ticketType
(),
"
availableStatus
"
,
""
))
var
states
=
JSON
.
parse
(
KeywordUtils
.
getAttributeRelation
(
this
.
type
,
$KeywordRegistry
.
ticketType
(),
"
availableStatus
"
,
"
[]
"
))
if
(
states
==
null
)
if
(
states
==
null
)
return
""
;
return
[];
return
states
;
return
states
;
}
}
...
...
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