mailmanager/www AccountSettings.zpt,1.29.2.2,1.29.2.3

[Andrew V. <av...@us...>]

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

Modified Files:
      Tag: RELENG_2_0
	AccountSettings.zpt 
Log Message:
Members of groups can now optionally be informed when a new ticket arrives
at an account which assigned to their group. Note that this has resulted in
a schema change to the mm_account table. RFE 1208284


Index: AccountSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/AccountSettings.zpt,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -d -r1.29.2.2 -r1.29.2.3
--- AccountSettings.zpt	23 May 2005 21:10:50 -0000	1.29.2.2
+++ AccountSettings.zpt	25 May 2005 11:39:48 -0000	1.29.2.3
@@ -204,13 +204,26 @@
             </tr>
 
             <tr>
-              <td><b i18n:translate="notification">Notification:</b></td>
               <td>
-                <input tal:attributes="checked acc_or_req/notify_user | nothing"
+                <b>
+                  <span tal:omit-tag="not:exists:request/flag_notification"
+                        class="red"  i18n:translate="notification">
+                    Notification:
+                  </span>
+                </b>
+              </td>
+              <td>
+                <input tal:attributes="checked acc_or_req/notify_user| nothing"
                        name="notify_user" type="checkbox" />
                 <tal:i18n i18n:translate="notify_assigned">
                   Notify assigned user by email when new messages arrive
                 </tal:i18n>
+                <br />
+                <input tal:attributes="checked acc_or_req/notify_group| nothing"
+                       name="notify_group" type="checkbox" />
+                <tal:i18n i18n:translate="notify_group">
+                  Notify other group members when new messages arrive
+                </tal:i18n>
               </td>
             </tr>
 
@@ -516,10 +529,14 @@
 
             <tr>
               <td><b i18n:translate="notification">Notification:</b></td>
-              <td tal:condition="exists:request/notify_user"
-                  i18n:translate="on">On</td>
-              <td tal:condition="not:exists:request/notify_user"
-                  i18n:translate="off">Off</td>
+              <td>
+                <tal:i18n condition="exists:request/notify_user"
+                          i18n:translate="user">User</tal:i18n>
+                <tal:i18n condition="exists:request/notify_group"
+                          i18n:translate="group">Group</tal:i18n>
+                <tal:i18n condition="not:request/notify_user|request/notify_group|nothing"
+                          i18n:translate="off">Off</tal:i18n>
+              </td>
             </tr>
 
             <tr>
@@ -714,6 +731,8 @@
                        tal:attributes="value request/assign_group" />
                 <input tal:condition="exists:request/notify_user"
                        type="hidden" name="notify_user" value="1" />
+                <input tal:condition="exists:request/notify_group"
+                       type="hidden" name="notify_group" value="1" />
                 <input type="hidden" name="routing"
                        tal:attributes="value request/routing" />
                 <input type="hidden" name="mail_server"