Changeset 6604

Timestamp:

09/07/08 21:32:35 (5 years ago)

Author:

p_lindheimer

Message:

re #3147, allows a 0 sec retry as before, rename None to 'No Retry', clarify the tooltip info, and change none to 0 in queues.conf when none is selected so that future versions of Asterisk don't get upset with a bogus value since it expects a number

Files:

• modules/branches/2.5/queues/functions.inc.php (modified) (3 diffs)
• modules/branches/2.5/queues/page.queues.php (modified) (1 diff)

modules/branches/2.5/queues/functions.inc.php

@@ -78 +78 @@
-            case 'autofill': 
-              break;
+            case 'retry': 
+              if ($data == 'none') {
+                $data = 0;
+              }
+              // no break, fallthrough to default
-            default:
-              $output .= $keyword."=".$data."\n";
@@ -95 +100 @@
-            case 'ringinuse': 
-              break;
+            case 'retry': 
+              if ($data == 'none') {
+                $data = 0;
+              }
+              // no break, fallthrough to default
-            default:
-              $output .= $keyword."=".$data."\n";
@@ -299 +309 @@
-          }
-          $options = 't';
-
+ {
-            $options .= 'r';
-
-
-
+
+
+
+
-          if (isset($q['music'])) {
-            $ext->add('ext-queues', $exten, '', new ext_setvar('__MOHCLASS', $q['music']));

modules/branches/2.5/queues/page.queues.php

@@ -461 +461 @@
-
-  <tr>
-Select none to dissable retying and to go straight to the fail over destination
+Choosing \"No Retry\" will exit the Queue and go to the fail-over destination as soon as the first attempted agent times-out, additional agents will not be attempted.
-    <td>
-      <select name="retry" tabindex="<?php echo ++$tabindex;?>">
-      <?php
-        $default = (isset($retry) ? $retry : 5);
-ne
-1
-
+ Retry
+0
+=
-        }
-      ?>