[Erp5-report] r8204 - in /erp5/trunk/products/ERP5Form: ListBox.py www/ListBox_asHTML.zpt

[nobody at svn.erp5.org]

Author: yo
Date: Wed Jun 28 16:02:42 2006
New Revision: 8204

URL: http://svn.erp5.org?rev=8204&view=rev
Log:
Try getProperty only if hasProperty succeeds. Pass form_id to portal_selections/setSelectionQuickSortOrder.

Modified:
    erp5/trunk/products/ERP5Form/ListBox.py
    erp5/trunk/products/ERP5Form/www/ListBox_asHTML.zpt

Modified: erp5/trunk/products/ERP5Form/ListBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ListBox.py?rev=8204&r1=8203&r2=8204&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ListBox.py (original)
+++ erp5/trunk/products/ERP5Form/ListBox.py Wed Jun 28 16:02:42 2006
@@ -1788,9 +1788,13 @@
 
               original_value = getattr(obj, property_id, None)
               processed_value = original_value
-              if not callable(original_value):
-                original_value = obj.getProperty(property_id)
-                processed_value = original_value
+              if not callable(original_value) and obj.hasProperty(property_id):
+                try:
+                  original_value = obj.getProperty(property_id)
+                  processed_value = original_value
+                except AttributeError:
+                  original_value = getattr(obj, property_id)
+                  processed_value = original_value
             except (AttributeError, KeyError):
               original_value = None
               processed_value = 'Could not evaluate %s' % property_id
@@ -2330,8 +2334,8 @@
 """)
       if sql is not None:
         html_list.append("""\
-<a href="portal_selections/setSelectionQuickSortOrder?selection_name=%s&sort_on=%s">%s</a>\
-""" % (self.getSelectionName(), sql, unicode(Message(domain = ui_domain, message = title))))
+<a href="portal_selections/setSelectionQuickSortOrder?selection_name=%s&amp;sort_on=%s&amp;form_id=%s">%s</a>\
+""" % (self.getSelectionName(), sql, self.getForm().id, unicode(Message(domain = ui_domain, message = title))))
 
         if sort_order == 'ascending':
           html_list.append("""\

Modified: erp5/trunk/products/ERP5Form/www/ListBox_asHTML.zpt
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/www/ListBox_asHTML.zpt?rev=8204&r1=8203&r2=8204&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/www/ListBox_asHTML.zpt (original)
+++ erp5/trunk/products/ERP5Form/www/ListBox_asHTML.zpt Wed Jun 28 16:02:42 2006
@@ -206,8 +206,8 @@
                                        title python: value[1];
                                        sort_order python: value[2]">
                   <td tal:condition="sql" class="Data">
-                    <a href="portal_selections/setSelectionQuickSortOrder?selection_name=default&amp;sort_on=id"
-                      tal:attributes="href string:portal_selections/setSelectionQuickSortOrder?selection_name=${selection_name}&amp;sort_on=${sql}"
+                    <a href="portal_selections/setSelectionQuickSortOrder?selection_name=default&amp;sort_on=id&amp;form_id=view"
+                      tal:attributes="href string:portal_selections/setSelectionQuickSortOrder?selection_name=${selection_name}&amp;sort_on=${sql}&amp;form_id=${form_id}"
                       tal:content="title" i18n:domain="ui" i18n:translate="">ID</a>
                     <img tal:condition="python: sort_order == 'ascending'"
                       src="1bottomarrow.png" alt="Ascending Display" title="Ascending Display"