r13550 - in MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk: docs src/archetypes/referencebrowserwidget/browser src/archetypes/referencebrowserwidget/skins/referencebrowser

Author: thomasdesvenain
Date: Thu Mar 31 18:59:24 2011
New Revision: 13550

Modified:
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/popup.pt
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/skins/referencebrowser/referencebrowser.js
Log:
Fixed: widget did not work when search was disallowed.
Render hidden part of search form in popup since it's needed in every case by javascript stuff.

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt	Thu Mar 31 18:59:24 2011
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* Fixed: widget did not work when search was disallowed.
+  [thomasdesvenain]
+
 1.0rc1 - 02.04.2010
 -------------------
 

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/popup.pt
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/popup.pt	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/popup.pt	Thu Mar 31 18:59:24 2011
@@ -41,13 +41,12 @@
       </div>
     </div>
 
-
     <!-- Search form -->
     <form action="search" method="post" name="search" id="search"
           style="text-align: right;"
-          tal:condition="widget/allow_search"
           tal:attributes="action request/getURL">
-
+     <tal:formactions
+          tal:condition="widget/allow_search">
       <div class="field" >
         <tal:indexes condition="widget/show_indexes">
         <label i18n:translate="referencebrowser_search_index_label">
@@ -91,18 +90,20 @@
                i18n:attributes="value label_search;"
                />
       </div>
-      <!-- add these to make sure that after a search result, we still have
-           these paremeters -->
-      <input type="hidden" name="fieldName" value=""
-             tal:attributes="value fieldName" />
-      <input type="hidden" name="fieldRealName" value=""
-             tal:attributes="value fieldRealName" />
-      <input type="hidden" name="at_url" value=""
-             tal:attributes="value view/at_url" />
-      <input type="hidden" name="multiValued" value=""
-             tal:attributes="value multiValued" />
-      <input type="hidden" name="close_window" value=""
-             tal:attributes="value view/close_window" />
+     </tal:formactions>
+
+     <!-- add these to make sure that after a search result, we still have
+          these paremeters -->
+     <input type="hidden" name="fieldName" value=""
+            tal:attributes="value fieldName" />
+     <input type="hidden" name="fieldRealName" value=""
+            tal:attributes="value fieldRealName" />
+     <input type="hidden" name="at_url" value=""
+            tal:attributes="value view/at_url" />
+     <input type="hidden" name="multiValued" value=""
+            tal:attributes="value multiValued" />
+     <input type="hidden" name="close_window" value=""
+            tal:attributes="value view/close_window" />
     </form>
     <!-- actual list of objects, either searchresults or folder contents -->
     <tal:block tal:define="batch view/getResult;">

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/skins/referencebrowser/referencebrowser.js
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/skins/referencebrowser/referencebrowser.js	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/skins/referencebrowser/referencebrowser.js	Thu Mar 31 18:59:24 2011
@@ -46,6 +46,7 @@
   jq('[id^=atrb_] input.insertreference').live('click', function(event) {
       var target = jq(this);
       var wrap = target.parents('.overlaycontent');
+      console.log(wrap);
       var fieldname = wrap.find('input[name=fieldName]').attr('value');
       var multi = wrap.find('input[name=multiValued]').attr('value');
       var close_window = wrap.find('input[name=close_window]').attr('value');
@@ -54,6 +55,7 @@
       var uid = target.attr('rel');
       var messageId;
       if (this.checked === true) {
+    	  console.log(fieldname);
           refbrowser_setReference('ref_browser_' + fieldname,
                                   uid, title, parseInt(multi));
           messageId = '#messageAdded';
@@ -157,6 +159,7 @@
         // now add the new item
         var fieldname = widget_id.substr('ref_browser_'.length);
         list = document.getElementById(widget_id);
+        console.log(widget_id)
         // add ul-element to DOM, if it is not there
         if (list === null) {
             container = jq('#archetypes-fieldname-' + fieldname +

------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself; 
WebMatrix provides all the features you need to develop and 
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf