Menu
▾
▴
mailmanager/www Search.zpt,1.15.2.3,1.15.2.4 SystemSettings.zpt,1.28.2.1,1.28.2.2 ticket_index_html.zpt,1.75.2.11,1.75.2.12
|
From: Andrew V. <av...@us...> - 2005-03-30 09:40:47
|
Update of /cvsroot/mailmanager/mailmanager/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16638/www Modified Files: Tag: db-backend Search.zpt SystemSettings.zpt ticket_index_html.zpt Log Message: Categories now work. I've pretty much left them as before with most of the category action happening in the ZODB. This will ease migration and keep everything simple at this stage. In the future categories will move into the relational database. Index: ticket_index_html.zpt =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/www/ticket_index_html.zpt,v retrieving revision 1.75.2.11 retrieving revision 1.75.2.12 diff -u -d -r1.75.2.11 -r1.75.2.12 --- ticket_index_html.zpt 28 Mar 2005 20:21:17 -0000 1.75.2.11 +++ ticket_index_html.zpt 30 Mar 2005 09:40:38 -0000 1.75.2.12 @@ -280,7 +280,6 @@ </td> </tr> - <!-- XXX category not sorted out yet <tr tal:repeat="cat python:[i for i in range(len(here.category_on)) if here.category_on[i]]"> <div tal:define="cat_name string:category$cat; curr_cat python:getattr(here, cat_name)" @@ -304,7 +303,7 @@ </select> </td> </div> - </tr> --> + </tr> <tr tal:condition="python:here.support_of or request.get('flag_support_of')"> <td> @@ -506,8 +505,7 @@ </td> </tr> - <!-- need to sort out categories - <tr tal:repeat="cat python:[i for i in range(len(here.category_on)) if history.has_key('category%d' % i)]" + <tr tal:repeat="cat python:[i for i in range(len(here.category_on)) if getattr(history, 'category%d' % i)]" class="shade"> <td> <b tal:content="python:'%s:' % here.category_labels[cat]"> @@ -515,7 +513,7 @@ </b> </td> <td tal:content="python:history['category%d' % cat]">category</td> - </tr> --> + </tr> <tr tal:condition="history/support_of" class="shade"> <td><b i18n:translate="support_of_label">Support of:</b></td> Index: Search.zpt =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/www/Search.zpt,v retrieving revision 1.15.2.3 retrieving revision 1.15.2.4 diff -u -d -r1.15.2.3 -r1.15.2.4 --- Search.zpt 26 Mar 2005 21:46:30 -0000 1.15.2.3 +++ Search.zpt 30 Mar 2005 09:40:37 -0000 1.15.2.4 @@ -152,6 +152,9 @@ <td> <select tal:attributes="name string:category$cat"> <option value="" i18n:translate="any">Any</option> + <option tal:repeat="item python:here.sql.getCategoriesUsed(category=cat)" + tal:attributes="value item/category" + tal:content="item/category">Sales</option> </select> </td> </tr> Index: SystemSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/www/SystemSettings.zpt,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -u -d -r1.28.2.1 -r1.28.2.2 --- SystemSettings.zpt 28 Mar 2005 08:31:00 -0000 1.28.2.1 +++ SystemSettings.zpt 30 Mar 2005 09:40:38 -0000 1.28.2.2 @@ -161,9 +161,9 @@ <td> <select tal:attributes="name string:category$cat"> <option value="" i18n:translate="any">Any</option> - <option tal:repeat="item python:here.Catalog.uniqueValuesFor('category%d' % cat)" - tal:attributes="value item" - tal:content="item">Sales lead</option> + <option tal:repeat="item python:here.sql.getCategoriesUsed(category=cat)" + tal:attributes="value item/category" + tal:content="item/category">Sales lead</option> </select> </td> </tr> |