projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cbc36fe
)
option to force default queue for new tickets in cust_main, RT#8889
author
mark
<mark>
Thu, 22 Jul 2010 23:33:30 +0000
(23:33 +0000)
committer
mark
<mark>
Thu, 22 Jul 2010 23:33:30 +0000
(23:33 +0000)
FS/FS/Conf.pm
patch
|
blob
|
history
httemplate/view/cust_main/tickets.html
patch
|
blob
|
history
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
acbd229
..
0d891be
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-2251,7
+2251,12
@@
and customer address. Include units.',
}
},
},
}
},
},
-
+ {
+ 'key' => 'ticket_system-force_default_queueid',
+ 'section' => '',
+ 'description' => 'Disallow queue selection when creating new tickets from customer view.',
+ 'type' => 'checkbox',
+ },
{
'key' => 'ticket_system-selfservice_queueid',
'section' => '',
{
'key' => 'ticket_system-selfservice_queueid',
'section' => '',
diff --git
a/httemplate/view/cust_main/tickets.html
b/httemplate/view/cust_main/tickets.html
index
7a511a9
..
e90ae52
100644
(file)
--- a/
httemplate/view/cust_main/tickets.html
+++ b/
httemplate/view/cust_main/tickets.html
@@
-9,10
+9,15
@@
function updateTicketLink() {
keys %new_param),'Queue=') %>" + selector.options[selector.selectedIndex].value;
}
</SCRIPT>
keys %new_param),'Queue=') %>" + selector.options[selector.selectedIndex].value;
}
</SCRIPT>
-<A id="CreateTicketLink" HREF="">Create new ticket</A>
+<A id="CreateTicketLink" HREF="
<% $new_link %>
">Create new ticket</A>
in queue
in queue
-<SELECT NAME="Queue" id="Queue" onchange="updateTicketLink()">
% my %queues = FS::TicketSystem->queues();
% my %queues = FS::TicketSystem->queues();
+% if( $conf->exists('ticket_system-force_default_queueid') ) {
+<B><% $queues{$new_param{'Queue'}} %></B>
+<INPUT TYPE="hidden" NAME="Queue" VALUE="<% $new_param{'Queue'} %>">
+% }
+% else {
+<SELECT NAME="Queue" id="Queue" onchange="updateTicketLink()">
% foreach my $queueid ( sort { $queues{$a} cmp $queues{$b} } keys %queues ) {
% #should consider whether the user has ACL to create ticket in each queue
<OPTION VALUE="<% $queueid %>"
% foreach my $queueid ( sort { $queues{$a} cmp $queues{$b} } keys %queues ) {
% #should consider whether the user has ACL to create ticket in each queue
<OPTION VALUE="<% $queueid %>"
@@
-20,8
+25,9
@@
function updateTicketLink() {
><% $queues{$queueid} |h %>
% }
</SELECT>
><% $queues{$queueid} |h %>
% }
</SELECT>
-</FORM>
<SCRIPT DEFER TYPE="text/javascript">updateTicketLink();</SCRIPT>
<SCRIPT DEFER TYPE="text/javascript">updateTicketLink();</SCRIPT>
+% }
+</FORM>
<BR>
(<A HREF="<% $open_link %>">View <% $openlabel %> tickets for this customer</A>)
<BR>
(<A HREF="<% $open_link %>">View <% $openlabel %> tickets for this customer</A>)
@@
-87,6
+93,7
@@
function updateTicketLink() {
<%init>
<%init>
+my( $conf ) = new FS::Conf;
my( $cust_main ) = @_;
my( @tickets ) = $cust_main->tickets;
my( $cust_main ) = @_;
my( @tickets ) = $cust_main->tickets;