Changeset 17:0b77281b458c in ralphm-patches

Timestamp:

Dec 28, 2009, 9:17:52 PM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

More consistent naming.

File:

• pubsub-subscription-options.patch (modified) (4 diffs)

pubsub-subscription-options.patch

@@ -1 @@
-diff -r 2919e60d3588 -r 6825608361d1 wokkel/data_form.py
+diff -r 2919e60d3588 wokkel/data_form.py
 --- a/wokkel/data_form.py       Mon Dec 28 12:13:34 2009 +0100
-+++ b/wokkel/data_form.py       Mon Dec 28 21:16:30 2009 +0100
++++ b/wokkel/data_form.py       Mon Dec 28 21:17:39 2009 +0100
 @@ -76,6 +76,7 @@
              option['label'] = self.label
@@ -99 +99 @@
 +
 +            field.typeCheck()
-diff -r 2919e60d3588 -r 6825608361d1 wokkel/pubsub.py
+diff -r 2919e60d3588 wokkel/pubsub.py
 --- a/wokkel/pubsub.py  Mon Dec 28 12:13:34 2009 +0100
-+++ b/wokkel/pubsub.py  Mon Dec 28 21:16:30 2009 +0100
++++ b/wokkel/pubsub.py  Mon Dec 28 21:17:39 2009 +0100
 @@ -228,7 +228,7 @@
      # Map request verb to parameter handler names
@@ -227 +227 @@
 -
      def _formFromConfiguration(self, resource, values):
-         options = resource.getConfigurationOptions()
+-        options = resource.getConfigurationOptions()
 -        fields = self._makeFields(options, values)
++        fieldDefs = resource.getConfigurationOptions()
          form = data_form.Form(formType="form",
 -                              formNamespace=NS_PUBSUB_NODE_CONFIG,
@@ -234 +235 @@
 -
 +                              formNamespace=NS_PUBSUB_NODE_CONFIG)
-+        form.makeFields(values, options)
++        form.makeFields(values, fieldDefs)
          return form
  
  
-diff -r 2919e60d3588 -r 6825608361d1 wokkel/test/test_pubsub.py
+diff -r 2919e60d3588 wokkel/test/test_pubsub.py
 --- a/wokkel/test/test_pubsub.py        Mon Dec 28 12:13:34 2009 +0100
-+++ b/wokkel/test/test_pubsub.py        Mon Dec 28 21:16:30 2009 +0100
++++ b/wokkel/test/test_pubsub.py        Mon Dec 28 21:17:39 2009 +0100
 @@ -447,6 +447,37 @@
          return d