From: Graeme M. <ma...@us...> - 2005-09-30 13:29:18
|
Update of /cvsroot/mailmanager/mailmanager/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14689 Modified Files: AccountSettings.zpt OptionSettings.zpt SystemSettings.zpt Log Message: Pick up a couple of places where checked/selected were not being set correctly. Index: AccountSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/www/AccountSettings.zpt,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- AccountSettings.zpt 30 Sep 2005 11:29:15 -0000 1.40 +++ AccountSettings.zpt 30 Sep 2005 13:29:08 -0000 1.41 @@ -119,13 +119,13 @@ <h3 i18n:translate="routing_1">Routing #1</h3> <p> - <input type="radio" name="routing" id="mail_forwarded" value="forwarded" tal:define="routing acc_or_req/routing | string:forwarded" tal:attributes="checked python:routing=='forwarded'" /> + <input type="radio" name="routing" id="mail_forwarded" value="forwarded" tal:define="routing acc_or_req/routing | string:forwarded" tal:attributes="checked python:test(routing=='forwarded', 1, None)" /> <label for="mail_forwarded" i18n:translate="mail_forwarded">Incoming mail forwarded to Account</label><br /> </p> <h3 i18n:translate="routing_2">Routing #2</h3> <p> - <input type="radio" name="routing" id="get_from_server" value="get" tal:define="routing acc_or_req/routing | nothing" tal:attributes="checked python:routing == 'get'" /> + <input type="radio" name="routing" id="get_from_server" value="get" tal:define="routing acc_or_req/routing | nothing" tal:attributes="checked python:test(routing == 'get', 1, None)" /> <label for="get_from_server" i18n:translate="get_from_server">Get from server (fill in details below)</label> </p> <p> Index: SystemSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/www/SystemSettings.zpt,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- SystemSettings.zpt 30 Sep 2005 11:29:15 -0000 1.37 +++ SystemSettings.zpt 30 Sep 2005 13:29:09 -0000 1.38 @@ -134,39 +134,39 @@ <label i18n:translate="display_columns">Display columns</label> </p> <p> - <input type="checkbox" id="ticket_id" name="ticket_id" value="1" tal:attributes="checked here/display_column/ticket_id" /> + <input type="checkbox" id="ticket_id" name="ticket_id" value="1" tal:attributes="checked here/display_column/ticket_id | nothing" /> <label i18n:translate="ticket_number" for="ticket_id">Ticket number</label> </p> <p> - <input type="checkbox" name="status" id="status" value="1" tal:attributes="checked here/display_column/status" /> + <input type="checkbox" name="status" id="status" value="1" tal:attributes="checked here/display_column/status | nothing" /> <label for="status" i18n:translate="status">Status</label> </p> <p> - <input type="checkbox" name="assigned" id="assigned" value="1" tal:attributes="checked here/display_column/assigned" /> + <input type="checkbox" name="assigned" id="assigned" value="1" tal:attributes="checked here/display_column/assigned | nothing" /> <label for="assigned" i18n:translate="assigned_to">Assigned to</label> </p> <p> - <input type="checkbox" name="title" id="title" value="1" tal:attributes="checked here/display_column/title" /> + <input type="checkbox" name="title" id="title" value="1" tal:attributes="checked here/display_column/title | nothing" /> <label for="title" i18n:translate="subject">Subject</label> </p> <p> - <input type="checkbox" name="from_name" id="from_name" value="1" tal:attributes="checked here/display_column/from_name" /> + <input type="checkbox" name="from_name" id="from_name" value="1" tal:attributes="checked here/display_column/from_name | nothing" /> <label for="from_name" i18n:translate="from">From</label> </p> <p> - <input type="checkbox" name="time" id="time" value="1" tal:attributes="checked here/display_column/time" /> + <input type="checkbox" name="time" id="time" value="1" tal:attributes="checked here/display_column/time | nothing" /> <label for="time" i18n:translate="time">Time</label> </p> <p> - <input type="checkbox" name="date" id="date" value="1" tal:attributes="checked here/display_column/date" /> + <input type="checkbox" name="date" id="date" value="1" tal:attributes="checked here/display_column/date | nothing" /> <label for="date" i18n:translate="date">Date</label> </p> <p> - <input type="checkbox" name="priority" id="priority" value="1" tal:attributes="checked here/display_column/priority" /> + <input type="checkbox" name="priority" id="priority" value="1" tal:attributes="checked here/display_column/priority | nothing" /> <label for="priority" i18n:translate="priority">Priority</label> </p> <p tal:repeat="cat python:[cat for cat in here.sql.listCategories() if cat['enabled']]"> - <input type="checkbox" name="category0" id="category0" value="1" tal:attributes="name python:'category%d' % cat['id']; id python:'category%d' % cat['id']; checked python:here.display_column['category%d' % cat['id']]" /> + <input type="checkbox" name="category0" id="category0" value="1" tal:attributes="name python:'category%d' % cat['id']; id python:'category%d' % cat['id']; checked python:test(here.display_column['category%d' % cat['id']], 1, None)" /> <label tal:attributes="for python:'category%d' % cat['id']" for="category0" tal:replace="cat/label">Category</label><br /> </p> <p> Index: OptionSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/www/OptionSettings.zpt,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- OptionSettings.zpt 30 Sep 2005 11:29:15 -0000 1.28 +++ OptionSettings.zpt 30 Sep 2005 13:29:09 -0000 1.29 @@ -120,8 +120,8 @@ <p tal:define="cat python:here.sql.listCategories(category_id=number)[0]"> <input name="cat:int" type="hidden" tal:attributes="value number" /> <input name="label" size="30" tal:attributes="value cat/label" /> - <input type="radio" id="cat_on" name="on:int" value="1" tal:attributes="checked cat/enabled" /> <label i18n:translate="on" for="cat_on">On</label> - <input type="radio" id="cat_off" name="on:int" value="0" tal:attributes="checked not:cat/enabled" /> <label i18n:translate="off" for="cat_off">Off</label> + <input type="radio" id="cat_on" name="on:int" value="1" tal:attributes="checked cat/enabled | nothing" /> <label i18n:translate="on" for="cat_on">On</label> + <input type="radio" id="cat_off" name="on:int" value="0" tal:attributes="checked not:cat/enabled | nothing" /> <label i18n:translate="off" for="cat_off">Off</label> <input type="submit" value="Change" name="setCategory:method" /> </p> <table summary="Category choices" i18n:attributes="summary category_choices;"> |