[Erp5-report] r41262 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Dec  9 12:45:18 2010
New Revision: 41262

URL: http://svn.erp5.org?rev=41262&view=rev
Log:
Allow to enable / disable gadgets globally (for site admins).

Modified:
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePag_getPadAsJSON.xml
    erp5/trunk/bt5/erp5_knowledge_pad/bt/revision

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml?rev=41262&r1=41261&r2=41262&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml [utf8] Thu Dec  9 12:45:18 2010
@@ -36,10 +36,14 @@
             <key> <string>_text</string> </key>
             <value> <unicode encoding="cdata"><![CDATA[
 
-<tal:block\n
-     tal:repeat="box_id python: options[\'section_layout\']"\n
-     tal:define="real_context python: options.get(\'real_context\', None);\n
-                 cancel_url python: options.get(\'cancel_url\', None);">\n
+<tal:block tal:define="layout python: options[\'section_layout\'];\n
+                       real_context python: options.get(\'real_context\', None);\n
+                       cancel_url python: options.get(\'cancel_url\', None);\n
+                       isAnon python: here.portal_membership.isAnonymousUser();\n
+                       visibility_css_dict python: {\'visible\': \'block\',\n
+                                                   \'invisible\': \'none\'};">\n
+\n
+<tal:block tal:repeat="box_id layout">\n
   <tal:block \n
         tal:condition="python: getattr(here, box_id, None) is not None"\n
         tal:define="box python: getattr(here, box_id);\n
@@ -47,11 +51,9 @@
                     view_form_dom_id python: \'%s_content\' %box_dom_id;\n
                     edit_form_dom_id python: \'%s_edit_form\' %box_dom_id;\n
                     gadget python: box.getSpecialiseValue();\n
+                    gadget_state python: gadget.getValidationState();\n
                     dummy python: request.set(\'is_gadget_mode\', \'1\');\n
                     dummy python: request.set(\'box_relative_url\', box.getRelativeUrl());\n
-                    visibility_css_dict python: {\'visible\': \'block\',\n
-                                                 \'invisible\': \'none\'};\n
-                    isAnon python: here.portal_membership.isAnonymousUser();\n
                     edit_form_id gadget/getEditFormId;\n
                     view_form_id gadget/getViewFormId;\n
                     render_type gadget/getRenderType;\n
@@ -69,8 +71,17 @@
                     isAnonymousKnowledgePadUsed python:\n
                        request.get(\'is_anonymous_knowledge_pad_used\', 0);">\n
 \n
+\n
+\n
     <div class="block" \n
-      tal:condition="python: gadget is not None"\n
+      tal:condition="python: gadget is not None and gadget_state==\'invisible\'"\n
+      tal:attributes="id box_dom_id"\n
+      style="display:none;"></div>\n
+\n
+\n
+    <!-- Show only public gadgets -->\n
+    <div class="block" \n
+      tal:condition="python: gadget is not None and gadget_state!=\'invisible\'"\n
       tal:attributes="id box_dom_id">\n
 \n
       <h3 class="handle">\n
@@ -204,6 +215,7 @@
   </div>\n
   </tal:block>\n
 </tal:block>\n
+</tal:block>\n
 
 
 ]]></unicode> </value>

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePag_getPadAsJSON.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePag_getPadAsJSON.xml?rev=41262&r1=41261&r2=41262&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePag_getPadAsJSON.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePag_getPadAsJSON.xml [utf8] Thu Dec  9 12:45:18 2010
@@ -68,7 +68,7 @@ for box in pad.objectValues():\n
   gadget = box.getSpecialiseValue()\n
   gadget_type = gadget.getRenderType()\n
   if box.getValidationState() in [\'visible\', \'invisible\'] \\\n
-        and gadget_type==\'asynchronous\':\n
+        and gadget_type==\'asynchronous\' and gadget.getValidationState()!=\'invisible\':\n
     edit_form_id=gadget.getEditFormId()\n
     view_form_id=gadget.getViewFormId()\n
     base_url = \'%s/%s\' %(context.absolute_url(), view_form_id) \n

Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=41262&r1=41261&r2=41262&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Thu Dec  9 12:45:18 2010
@@ -1 +1 @@
-642
\ No newline at end of file
+643
\ No newline at end of file