Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
37b657bd
Commit
37b657bd
authored
11 years ago
by
Jared Hancock
Browse files
Options
Downloads
Patches
Plain Diff
Add help topic selection to filter actions
parent
cbcd02b0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/class.filter.php
+9
-0
9 additions, 0 deletions
include/class.filter.php
include/staff/filter.inc.php
+20
-0
20 additions, 0 deletions
include/staff/filter.inc.php
with
29 additions
and
0 deletions
include/class.filter.php
+
9
−
0
View file @
37b657bd
...
...
@@ -123,6 +123,10 @@ class Filter {
return
$this
->
ht
[
'canned_response_id'
];
}
function
getHelpTopic
()
{
return
$this
->
ht
[
'topic_id'
];
}
function
stopOnMatch
()
{
return
(
$this
->
ht
[
'stop_on_match'
]);
}
...
...
@@ -309,6 +313,10 @@ class Filter {
# Use canned response.
if
(
$this
->
getCannedResponse
())
$ticket
[
'cannedResponseId'
]
=
$this
->
getCannedResponse
();
# Apply help topic
if
(
$this
->
getHelpTopic
())
$ticket
[
'topicId'
]
=
$this
->
getHelpTopic
();
}
/* static */
function
getSupportedMatches
()
{
foreach
(
static
::
$match_types
as
$k
=>&
$v
)
{
...
...
@@ -498,6 +506,7 @@ class Filter {
.
',dept_id='
.
db_input
(
$vars
[
'dept_id'
])
.
',priority_id='
.
db_input
(
$vars
[
'priority_id'
])
.
',sla_id='
.
db_input
(
$vars
[
'sla_id'
])
.
',topic_id='
.
db_input
(
$vars
[
'topic_id'
])
.
',match_all_rules='
.
db_input
(
$vars
[
'match_all_rules'
])
.
',stop_onmatch='
.
db_input
(
isset
(
$vars
[
'stop_onmatch'
])
?
1
:
0
)
.
',reject_ticket='
.
db_input
(
isset
(
$vars
[
'reject_ticket'
])
?
1
:
0
)
...
...
This diff is collapsed.
Click to expand it.
include/staff/filter.inc.php
+
20
−
0
View file @
37b657bd
...
...
@@ -318,6 +318,26 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<span
class=
"error"
>
<?php
echo
$errors
[
'assign'
];
?>
</span>
</td>
</tr>
<tr>
<td
width=
"180"
>
Help Topic
</td>
<td>
<select
name=
"topic_id"
>
<option
value=
"0"
selected=
"selected"
>
—
Unchanged
—
</option>
<?php
$sql
=
'SELECT topic_id, topic FROM '
.
TOPIC_TABLE
.
' T ORDER by topic'
;
if
((
$res
=
db_query
(
$sql
))
&&
db_num_rows
(
$res
)){
while
(
list
(
$id
,
$name
)
=
db_fetch_row
(
$res
)){
$selected
=
(
$info
[
'topic_id'
]
&&
$id
==
$info
[
'topic_id'
])
?
'selected="selected"'
:
''
;
echo
sprintf
(
'<option value="%d" %s>%s</option>'
,
$id
,
$selected
,
$name
);
}
}
?>
</select>
<span
class=
"error"
>
<?php
echo
$errors
[
'topic_id'
];
?>
</span>
</td>
</tr>
<tr>
<th
colspan=
"2"
>
<em><strong>
Admin Notes
</strong>
: Internal notes.
</em>
...
...
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