Merge lp:~cjohnston/launchpad/1260760-unset-source into lp:launchpad

[Chris Johnston]

Use self.name for 'name' and self.input_id for 'id' when generating inputField in VocabularyPickerWidget.

Unmerged revisions

17142. By Chris Johnston on 2014-08-04

Split name and id for VocabularyPickerWidget in order for Zope to be able to access the name

=== modified file 'lib/lp/app/widgets/popup.py'
--- lib/lp/app/widgets/popup.py	2013-04-10 08:01:20 +0000
+++ lib/lp/app/widgets/popup.py	2014-08-04 15:23:15 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Single selection widget using a popup to select one item from many."""
@@ -93,7 +93,8 @@
     def inputField(self):
         d = {
             'formToken': self.formToken,
-            'name': self.input_id,
+            'id': self.input_id,
+            'name': self.name,
             'displayWidth': self.displayWidth,
             'displayMaxWidth': self.displayMaxWidth,
             'onKeyPress': self.onKeyPress,
@@ -101,7 +102,7 @@
             'cssClass': self.cssClass,
             }
         return structured(
-            """<input type="text" value="%(formToken)s" id="%(name)s"
+            """<input type="text" value="%(formToken)s" id="%(id)s"
                          name="%(name)s" size="%(displayWidth)s"
                          maxlength="%(displayMaxWidth)s"
                          onKeyPress="%(onKeyPress)s" style="%(style)s"