agent option to select RT queue

2 files changed, 36 insertions, 5 deletions

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 9a0006792..8011e7697 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -36,19 +36,35 @@
         <% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
-            <tr><td><font color="#ff0000">no type</font></td></tr>
+            <tr>
+              <td><font color="#ff0000">no type</font></td>
+            </tr>
           <% } elsif (   $type eq 'textarea'
                       || $type eq 'editlist'
                       || $type eq 'selectmultiple' ) { %>
-            <tr><td bgcolor="#ffffff">
+            <tr>
+              <td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
 </pre>
-            </td></tr>
+              </td>
+            </tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
-            <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
+            <tr>
+              <td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td>
+            </tr>
           <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
-            <tr><td bgcolor="#ffffff"><%= $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
+            <tr>
+              <td bgcolor="#ffffff">
+                <%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>
+              </td></tr>
+          <% } elsif ( $type eq 'select-sub' ) { %>
+            <tr>
+              <td bgcolor="#ffffff">
+                <%= $conf->config($i->key) %>: 
+                <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
+              </td>
+            </tr>
           <% } else { %>
             <tr><td>
               <font color="#ff0000">unknown type <%= $type %></font>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 409869e11..ff29d8578 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -73,6 +73,21 @@ function SafeOnsubmit() {
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
               <% } %>
             </select>
+          <% } elsif ( $type eq 'select-sub' ) { %>
+            <select name="<%= $i->key. $n %>">
+              <option value="">
+              <% my %options = &{$i->options_sub};
+                 my @options = sort { $a <=> $b } keys %options;
+                 my %saw;
+                 foreach my $value ( @options ) {
+                    local($^W)=0; next if $saw{$value}++;
+              %>
+                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) ? ' SELECTED' : '' %>><%= $value %>: <%= $options{$value} %>
+              <% } %>
+              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! exists $options{$conf->config($i->key)} ) { %>
+                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>: <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
+              <% } %>
+            </select>
           <% } elsif ( $type eq 'editlist' )  { %>
             <script>
               function doremove<%= $i->key. $n %>() {