allow listing popup to be used in query forms (thanks Marcus Priesch)

Author: Richard Jones

CHANGES.txt

@@ -28,6 +28,7 @@ Feature:
 - multiple selection Link/Multilink search field (thanks Marlon van den Berg)
 - relaxed hyperlinking in web interface (accept "issue123" or "Issue 123")
 - record journaltag lookup ("fixes" sf bug 998140)
+- allow listing popup to be used in query forms (thanks Marcus Priesch)
 
 Fixed:
 - postgres backend open doesn't hide corruption in schema (sf bug 956375)

doc/index.txt

@@ -116,6 +116,7 @@ Luke Opperman,
 Eddie Parker,
 Will Partain,
 Ewout Prangsma,
+Marcus Priesch,
 Bernhard Reiter,
 Roy Rapoport,
 John P. Rouillard,

roundup/cgi/templating.py

@@ -596,31 +596,37 @@ def filter(self, request=None, filterspec={}, sort=(None,None),
         return l
 
     def classhelp(self, properties=None, label=''"(list)", width='500',
-            height='400', property=''):
-        ''' Pop up a javascript window with class help
+            height='400', property='', form='itemSynopsis'):
+        '''Pop up a javascript window with class help
 
-            This generates a link to a popup window which displays the
-            properties indicated by "properties" of the class named by
-            "classname". The "properties" should be a comma-separated list
-            (eg. 'id,name,description'). Properties defaults to all the
-            properties of a class (excluding id, creator, created and
-            activity).
+        This generates a link to a popup window which displays the
+        properties indicated by "properties" of the class named by
+        "classname". The "properties" should be a comma-separated list
+        (eg. 'id,name,description'). Properties defaults to all the
+        properties of a class (excluding id, creator, created and
+        activity).
 
-            You may optionally override the label displayed, the width and
-            height. The popup window will be resizable and scrollable.
+        You may optionally override the label displayed, the width and
+        height. The popup window will be resizable and scrollable.
 
-            If the "property" arg is given, it's passed through to the
-            javascript help_window function.
+        If the "property" arg is given, it's passed through to the
+        javascript help_window function.
+
+        If the "form" arg is given, it's passed through to the 
+        javascript help_window function. - it's the name of the form
+        the "property" belongs to.
         '''
         if properties is None:
             properties = self._klass.getprops(protected=0).keys()
             properties.sort()
             properties = ','.join(properties)
         if property:
             property = '&property=%s'%property
+        if form:
+            form = '&form=%s'%form
         return '<a class="classhelp" href="javascript:help_window(\'%s?'\
-            '@startwith=0&amp;@template=help&amp;properties=%s%s\', \'%s\', \
-            \'%s\')">%s</a>'%(self.classname, properties, property, width,
+           '@startwith=0&amp;@template=help&amp;properties=%s%s%s\', \'%s\', \
+            \'%s\')">%s</a>'%(self.classname, properties, property, form, width,
             height, self._(label))
 
     def submit(self, label=''"Submit New Entry"):

templates/classic/html/_generic.help.html

@@ -8,7 +8,7 @@
       <script language="Javascript" type="text/javascript" 
           tal:content="structure string:
           // this is the name of the field in the original form that we're working on
-          field = '${request/form/property/value}';" >
+          form  = window.opener.document.${request/form/form/value};">
       </script>
       <script src="@@file/help_controls.js" type="text/javascript"><!-- 
       //--></script>

templates/classic/html/help_controls.js

@@ -1,6 +1,6 @@
 // initial values for either Nosy, Superseder, Topic and Waiting On,
 // depending on which has called
-original_field = window.opener.document.itemSynopsis[field].value;
+original_field = form[field].value;
 
 // Some browsers (ok, IE) don't define the "undefined" variable.
 undefined = document.geez_IE_is_really_friggin_annoying;
@@ -35,7 +35,7 @@ function determineList() {
 function updateList() {
   // write back to opener window
   if (document.frm_help.check==undefined) { return; }
-  window.opener.document.itemSynopsis[field].value = determineList();
+  form[field].value = determineList();
 }
 
 function updatePreview() {

templates/minimal/html/_generic.help.html

@@ -8,7 +8,7 @@
       <script language="Javascript" type="text/javascript" 
           tal:content="structure string:
           // this is the name of the field in the original form that we're working on
-          field = '${request/form/property/value}';" >
+          form  = window.opener.document.${request/form/form/value};">
       </script>
       <script src="@@file/help_controls.js" type="text/javascript"><!-- 
       //--></script>