MailManager/sql/v2_1 addQueue.zsql,1.1,1.2 createQueueingTables.zsql,1.2,1.3 editAccount.zsql,1.1,1.2 listQueues.zsql,1.1,1.2

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

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

Modified Files:
	addQueue.zsql createQueueingTables.zsql editAccount.zsql 
	listQueues.zsql 
Log Message:
Renamed queuename to queue_name to fit in with naming conventions
assign_queue now implemented for UI screens.


Index: createQueueingTables.zsql
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/sql/v2_1/createQueueingTables.zsql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- createQueueingTables.zsql	17 Jan 2006 11:44:11 -0000	1.2
+++ createQueueingTables.zsql	20 Jan 2006 09:31:37 -0000	1.3
@@ -23,9 +23,9 @@
 </dtml-comment>
 
 CREATE TABLE <dtml-var schema>mm_queue (
-    queuename VARCHAR(10) PRIMARY KEY,
-    queueuser VARCHAR(12),
-      FOREIGN KEY (queueuser) REFERENCES <dtml-var schema>mm_user(username),
+    queue_name VARCHAR(10) PRIMARY KEY,
+    queue_user VARCHAR(12),
+      FOREIGN KEY (queue_user) REFERENCES <dtml-var schema>mm_user(username),
     assign_group VARCHAR(12),
       FOREIGN KEY (assign_group) REFERENCES <dtml-var schema>mm_group(group_name) 
 ) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter>

Index: editAccount.zsql
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/sql/v2_1/editAccount.zsql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- editAccount.zsql	16 Jan 2006 16:56:13 -0000	1.1
+++ editAccount.zsql	20 Jan 2006 09:31:37 -0000	1.2
@@ -2,7 +2,7 @@
 title:Edit an account
 connection_id: mailmanager_db
 max_rows:0
-arguments:sqv_email sqv_assign_user sqv_assign_group sqv_notify_user sqv_notify_group sqv_routing sqv_mail_server sqv_mail_username sqv_mail_password sqv_server_type sqv_default_priority sqv_default_category0 sqv_default_category1 sqv_default_category2 sqv_response_target sqv_auto_reply sqv_reply_text sqv_html_reply sqv_signature sqv_signature_text sqv_html_signature
+arguments:sqv_email sqv_assign_user sqv_assign_group sqv_assign_queue sqv_notify_user sqv_notify_group sqv_routing sqv_mail_server sqv_mail_username sqv_mail_password sqv_server_type sqv_default_priority sqv_default_category0 sqv_default_category1 sqv_default_category2 sqv_response_target sqv_auto_reply sqv_reply_text sqv_html_reply sqv_signature sqv_signature_text sqv_html_signature
 
   General method used to edit an account's details
 
@@ -22,6 +22,8 @@
       , assign_user=<dtml-sqlvar sqv_assign_user type="nb" optional>, assign_group=NULL
     <dtml-elif sqv_assign_group>
       , assign_group=<dtml-sqlvar sqv_assign_group type="nb" optional>, assign_user=NULL
+    <dtml-elif sqv_assign_group>
+      , assign_queue=<dtml-sqlvar sqv_assign_queue type="nb" optional>, assign_queue=NULL
     </dtml-if>
     <dtml-if sqv_notify_user>, notify_user=<dtml-sqlvar sqv_notify_user type="nb" optional> </dtml-if>
     <dtml-if sqv_notify_group>, notify_group=<dtml-sqlvar sqv_notify_group type="nb" optional> </dtml-if>

Index: addQueue.zsql
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/sql/v2_1/addQueue.zsql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- addQueue.zsql	16 Jan 2006 16:56:13 -0000	1.1
+++ addQueue.zsql	20 Jan 2006 09:31:37 -0000	1.2
@@ -2,13 +2,13 @@
 title:Add a new queue  
 connection_id: mailmanager_db
 max_rows:0
-arguments:sqv_queuename sqv_queueuser sqv_assign_group
+arguments:sqv_queue_name sqv_queue_user sqv_assign_group
 </dtml-comment>
 
 INSERT INTO <dtml-var schema>mm_queue (
-        queuename, queueuser, assign_group
+        queue_name, queue_user, assign_group
 ) VALUES (
-        <dtml-sqlvar sqv_queuename type="nb">,
-        <dtml-sqlvar sqv_queueuser type="nb">,
+        <dtml-sqlvar sqv_queue_name type="nb">,
+        <dtml-sqlvar sqv_queue_user type="nb">,
         <dtml-sqlvar sqv_assign_group type="nb">
 )

Index: listQueues.zsql
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/sql/v2_1/listQueues.zsql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- listQueues.zsql	16 Jan 2006 16:56:13 -0000	1.1
+++ listQueues.zsql	20 Jan 2006 09:31:37 -0000	1.2
@@ -2,10 +2,10 @@
 title:List queues
 connection_id: mailmanager_db
 max_rows:0
-arguments:sqv_queuename
+arguments:sqv_queue_name
 </dtml-comment>
 SELECT * FROM <dtml-var schema>mm_queue
 <dtml-sqlgroup where>
-  <dtml-sqltest sqv_queuename column="queuename" type="nb" optional>
+  <dtml-sqltest sqv_queue_name column="queue_name" type="nb" optional>
 </dtml-sqlgroup>
-ORDER BY queuename
+ORDER BY queue_name