allow dispname to be passed to renderWith [SF#1424587]

rename dispname to @dispname to avoid name clashes in the future

force demo.py to have web debugging on (since it can't mail errors)

Author: Richard Jones

CHANGES.txt

@@ -14,6 +14,8 @@ Fixed:
 - Xapian indexer wasn't actually being used
 - fix reindexing in Xapian
 - fix indexing of message content on roundup-admin import
+- allow dispname to be passed to renderWith (sf bug 1424587)
+- rename dispname to @dispname to avoid name clashes in the future
 
 
 2006-02-03 1.0.1

demo.py

@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2003 Richard Jones ([email protected])
 #
-# $Id: demo.py,v 1.23 2004-11-06 15:05:47 a1s Exp $
+# $Id: demo.py,v 1.24 2006-02-08 04:03:54 richard Exp $
 
 import errno
 import os
@@ -33,6 +33,7 @@ def install_demo(home, backend, template):
     config['TRACKER_HOME'] = home
     config['MAIL_DOMAIN'] = 'localhost'
     config['DATABASE'] = 'db'
+    config['WEB_DEBUG'] = True
     if backend in ('mysql', 'postgresql'):
         config['RDBMS_HOST'] = 'localhost'
         config['RDBMS_USER'] = 'rounduptest'

doc/upgrading.txt

@@ -29,6 +29,18 @@ See the classic tracker ``page.html`` if you're unsure where this should
 go.
 
 
+1.1 Query Display Name
+----------------------
+
+The ``dispname`` web variable has been renamed ``@dispname`` to avoid
+clashing with other variables of the same name. If you are using the
+display name feature, you will need to edit your tracker's ``page.html``
+and ``issue.index.html`` pages to change ``dispname`` to ``@dispname``.
+
+A side-effect of this change is that the renderWith method used in the
+``home.html`` page may now take a dispname argument.
+
+
 Migrating from 0.8.x to 1.0
 ===========================
 

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.57 2006-02-08 03:47:28 richard Exp $
+#$Id: actions.py,v 1.58 2006-02-08 04:03:54 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random, csv, codecs
 
@@ -913,7 +913,7 @@ def handle(self):
         self.client.opendb(self.client.user)
 
         # set the session cookie
-        if self.form.get('remember'):
+        if self.form.has_key('remember'):
             self.client.set_cookie(self.client.user, expire=86400*365)
         else:
             self.client.set_cookie(self.client.user, expire=None)

roundup/cgi/templating.py

@@ -2155,6 +2155,11 @@ def _post_init(self):
                 self.special_char = name[0]
                 self.startwith = int(self.form[name].value)
 
+        # dispname
+        self.dispname = None
+        if self.form.has_key('@dispname'):
+            self.dispname = self.form['@dispname'].value
+
     def updateFromURL(self, url):
         ''' Parse the URL for query args, and update my attributes using the
             values.

templates/classic/html/issue.index.html

@@ -2,12 +2,14 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title" i18n:translate="" >
 	List of issues - 
-	<span tal:condition="python:request.form.has_key('dispname')" tal:replace="python:' %s - ' % request.form['dispname'].value" />
+	<span tal:condition="request/dispname"
+          tal:replace="python:' %s - '%request.dispname" />
 	<span tal:replace="config/TRACKER_NAME" i18n:name="tracker" />
 	</title>
 <span metal:fill-slot="body_title" tal:omit-tag="python:1"
 	i18n:translate="">List of issues 
-	<span tal:condition="python:request.form.has_key('dispname')" tal:replace="python:' - %s' % request.form['dispname'].value" />
+	<span tal:condition="request/dispname"
+          tal:replace="python:' - %s' % request.dispname" />
 </span>
 <td class="content" metal:fill-slot="content">
 

templates/classic/html/issue.search.html

@@ -207,8 +207,10 @@
 <tr><td>&nbsp;</td>
  <td colspan="4" class="help" i18n:translate="">
    *: The "all text" field will look in message bodies and issue titles<br>
+   <span tal:condition="python:request.user.hasPermission('Edit', 'query')">
    **: If you supply a name, the query will be saved off and available as a
        link in the sidebar
+   </span>
  </td>
 </tr>
 </table>

templates/classic/html/page.html

@@ -41,7 +41,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
    <span i18n:translate=""
     ><b>Your Queries</b> (<a href="query?@template=edit">edit</a>)</span><br>
    <tal:block tal:repeat="qs request/user/queries">
-    <a tal:attributes="href string:${qs/klass}?${qs/url}&dispname=${qs/name}"
+    <a tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}"
        tal:content="qs/name">link</a><br>
    </tal:block>
   </p>
@@ -53,9 +53,9 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
     <span tal:condition="python:request.user.hasPermission('Create', 'issue')">
       <a href="issue?@template=item" i18n:translate="">Create New</a><br>
     </span>
-    <a href="issue?@sort=-activity&@group=priority&@filter=status,assignedto&@columns=id,activity,title,creator,status&status=-1,1,2,3,4,5,6,7&assignedto=-1&dispname=Show%20Unassigned"
+    <a href="issue?@sort=-activity&@group=priority&@filter=status,assignedto&@columns=id,activity,title,creator,status&status=-1,1,2,3,4,5,6,7&assignedto=-1&@dispname=Show%20Unassigned"
      i18n:translate="">Show Unassigned</a><br>
-    <a href="issue?@sort=-activity&@group=priority&@filter=status&@columns=id,activity,title,creator,assignedto,status&status=-1,1,2,3,4,5,6,7&dispname=Show%20All"
+    <a href="issue?@sort=-activity&@group=priority&@filter=status&@columns=id,activity,title,creator,assignedto,status&status=-1,1,2,3,4,5,6,7&@dispname=Show%20All"
      i18n:translate="">Show All</a><br>
     <a href="issue?@template=search" i18n:translate="">Search</a><br>
     <input type="submit" class="form-small" value="Show issue:"