[Erp5-report] r30485 - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: fabien
Date: Tue Nov 10 17:37:21 2009
New Revision: 30485

URL: http://svn.erp5.org?rev=30485&view=rev
Log:
- expression "{}.fromkeys(field_key_list);"  makes AssertionError and break RSS Feeds gadget
- add 1 to KnowledgePad_generateAjaxCall parameters, this is to ignore_security_check : in case of rss gadget displayed to annonymous users, we want the user to be able to click on the rss feed to expand informations. (But move gadget and configure it is not allowed)

Modified:
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ListBox_asListStyleHTML.xml
    erp5/trunk/bt5/erp5_knowledge_pad/bt/revision

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ListBox_asListStyleHTML.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ListBox_asListStyleHTML.xml?rev=30485&r1=30484&r2=30485&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ListBox_asListStyleHTML.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ListBox_asListStyleHTML.xml [utf8] Tue Nov 10 17:37:21 2009
@@ -75,7 +75,8 @@
                        dom_id python: request.get(\'dom_id\',None) or box_id;\n
                        is_gadget_mode request/is_gadget_mode | nothing;\n
                        list_style python:request.get(\'list_style\', None);\n
-                       field_key_list python:[\'field_title\',\'field_date\',\'field_content\',\'field_img\',\'field_link\',\'field_others_links\',\'field_md5\',\'field_sender\'];\n
+                       value_dict python: {\'field_title\':None, \'field_date\': None, \'field_content\':None,\'field_img\':None,\'field_link\':None,\'field_others_links\':None,\'field_md5\':None,\'field_sender\':None};\n
+                       html_dict python: {\'field_title\':None, \'field_date\': None, \'field_content\':None,\'field_img\':None,\'field_link\':None,\'field_others_links\':None,\'field_md5\':None,\'field_sender\':None};\n
                        dummy python: context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \n
                                                                         \'text/html;; charset=utf-8\');"\n
            metal:define-macro="main">\n
@@ -140,9 +141,7 @@
 \n
           <ul>\n
             <tal:block tal:repeat="line line_list">\n
-              <li tal:define="value_dict python:{}.fromkeys(field_key_list);\n
-                              html_dict python:{}.fromkeys(field_key_list);\n
-                              empty python:value_dict.update(zip(here.getColumnAliasList(), [i[0] for i in line.getValueList()]));\n
+              <li tal:define="empty python:value_dict.update(zip(here.getColumnAliasList(), [i[0] for i in line.getValueList()]));\n
                               empty python:html_dict.update(zip(here.getColumnAliasList(), [i[0] for i in line.render()]));"\n
                   tal:attributes="id python:(value_dict[\'field_img\'] and \'with_img\') or \'\';">\n
                 <input tal:condition="not: repeat/line/index"\n
@@ -153,7 +152,7 @@
                      onmouseout="this.style.backgroundColor=\'inherit\';"\n
                      tal:attributes="class python:value_dict[\'field_md5\'] in read_item_list and \'read\' or \'\';\n
                                      title python:value_dict[\'field_sender\'];\n
-                                     onclick python:\'if(this.className!=\\\'read\\\'){MochiKit.Async.doSimpleXMLHttpRequest(\\\'Base_setRssItemReadInSelection\\\', {\\\'selection_name\\\':\\\'\'+selection_name+\'\\\',\\\'item\\\':\\\'\'+ \'%s\' % value_dict[\'field_md5\']+\'\\\'});;this.className=\\\'read\\\';;\'+real_context.KnowledgePad_generateAjaxCall(\'%s/Base_formatRssTitleWithUnreadItemCount\' % context_url,box,\'rss_title_\'+box.getId(),{\'rss_title\':rss_title,\'total_line\':total_line,\'selection_name\':selection_name})+\'}toggle(\\\'description_\'+box.getId()+\'_\'+str(repeat[\'line\'].index)+\'\\\');;\'">\n
+                                     onclick python:\'if(this.className!=\\\'read\\\'){MochiKit.Async.doSimpleXMLHttpRequest(\\\'Base_setRssItemReadInSelection\\\', {\\\'selection_name\\\':\\\'\'+selection_name+\'\\\',\\\'item\\\':\\\'\'+ \'%s\' % value_dict[\'field_md5\']+\'\\\'});;this.className=\\\'read\\\';;\'+real_context.KnowledgePad_generateAjaxCall(\'%s/Base_formatRssTitleWithUnreadItemCount\' % context_url,box,\'rss_title_\'+box.getId(),{\'rss_title\':rss_title,\'total_line\':total_line,\'selection_name\':selection_name}, 1)+\'}toggle(\\\'description_\'+box.getId()+\'_\'+str(repeat[\'line\'].index)+\'\\\');;\'">\n
                    <tal:block tal:condition="python:value_dict[\'field_img\']"\n
                              tal:content="structure python:html_dict[\'field_img\']">image</tal:block>\n
                   <a><span tal:content="python:value_dict[\'field_title\']">title</span>\n

Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=30485&r1=30484&r2=30485&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Tue Nov 10 17:37:21 2009
@@ -1,1 +1,1 @@
-416
+418