MailManager/www AccountSettings.zpt,1.60,1.61 Tickets.zpt,1.60,1.61

[Kevin C. <ke...@us...>]

Update of /cvsroot/mailmanager/MailManager/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25948/www

Modified Files:
	AccountSettings.zpt Tickets.zpt 
Log Message:
Renamed queuename to queue_name to fit in with naming conventions
assign_queue now implemented for UI screens.


Index: AccountSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/www/AccountSettings.zpt,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- AccountSettings.zpt	5 Jan 2006 15:35:06 -0000	1.60
+++ AccountSettings.zpt	20 Jan 2006 09:31:37 -0000	1.61
@@ -52,8 +52,8 @@
                 <strong tal:content="acc/email">te...@ex...</strong>
               </td>
 
-              <td tal:content="python:test(acc.assign_user, acc.assign_user, acc.assign_group)">
-                username
+              <td tal:content="python:test(acc.assign_user, acc.assign_user, test(acc.assign_group, acc.assign_group, acc.assign_queue))">
+                username/groupname/queuename
               </td>
 
               <td>
@@ -108,6 +108,15 @@
             </select>
           </p>
           <p>
+            <label for="assign_queue" tal:attributes="class python:test(request.has_key('flag_assign_queue'), 'error', None)" i18n:translate="or_queue">or Queue</label>
+            <select tal:attributes="tabindex tabindex/next" id="assign_queue" name="assign_queue" tal:define="assign_queue acc_or_req/assign_queue | nothing">
+              <option value="" i18n:translate="none">None</option>
+              <option tal:repeat="que here/sql/listQueues" tal:attributes="value que/queue_name; selected python:test(assign_queue == que.queue_name, 1, None)" tal:content="que/queue_name">Support Queue</option>
+            </select>
+          </p>
+
+          <!-- Give notification option if assigned to either a user or a queue -->
+          <p tal:condition="python:test(path('acc_or_req/notify_user|nothing')) or test(path('acc_or_req/notify_group|nothing'))">
             <label i18n:translate="notification">Notification</label>
             <span class="indentedonform">
               <input tal:attributes="tabindex tabindex/next; 

Index: Tickets.zpt
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/www/Tickets.zpt,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Tickets.zpt	16 Jan 2006 12:33:22 -0000	1.60
+++ Tickets.zpt	20 Jan 2006 09:31:37 -0000	1.61
@@ -186,11 +186,11 @@
             <tbody>
               <tr tal:repeat="queueinfo python:here.sql.listQueues()">
                 <form action="getQueuedTicket">
-                  <input type="hidden" name="queuename" tal:attributes="value queueinfo/queuename"/>
-                  <td tal:content="queueinfo/queuename">
+                  <input type="hidden" name="queuename" tal:attributes="value queueinfo/queue_name"/>
+                  <td tal:content="queueinfo/queue_name">
                     sales
                   </td>
-                  <td tal:content="python:here.sql.listTickets(sqv_assigned='_Q' + queueinfo.queuename, sqv_count=here.sql_true)[0].count">
+                  <td tal:content="python:here.sql.listTickets(sqv_assigned='_Q' + queueinfo.queue_name, sqv_count=here.sql_true)[0].count">
                     1
                   </td>
                   <td>