Merge lp:~methanal-developers/methanal/1092198-inputs-set-name-attribute into lp:methanal

Proposed by William Seligmann
Status: Merged
Approved by: Tristan Seligmann
Approved revision: 198
Merged at revision: 198
Proposed branch: lp:~methanal-developers/methanal/1092198-inputs-set-name-attribute
Merge into: lp:methanal
Diff against target: 99 lines (+15/-0)
8 files modified
methanal/themes/methanal-base/methanal-check-input.html (+1/-0)
methanal/themes/methanal-base/methanal-multicheck-input.html (+1/-0)
methanal/themes/methanal-base/methanal-multiselect-input.html (+1/-0)
methanal/themes/methanal-base/methanal-select-input.html (+1/-0)
methanal/themes/methanal-base/methanal-text-area-input.html (+1/-0)
methanal/themes/methanal-base/methanal-text-input.html (+1/-0)
methanal/themes/methanal-base/methanal-verified-password-input.html (+1/-0)
methanal/view.py (+8/-0)
To merge this branch: bzr merge lp:~methanal-developers/methanal/1092198-inputs-set-name-attribute
Reviewer Review Type Date Requested Status
Darren Dormer Approve
Tristan Seligmann Approve
Review via email: mp+149268@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Darren Dormer (ddormer) wrote :

The method "renderName" should just be called "name" as @renderer implies the method will be used to render.

review: Needs Fixing
Revision history for this message
Tristan Seligmann (mithrandi) wrote :

Actually, it can't be named "name" since the attribute storing the name string is already called that :/

Revision history for this message
Tristan Seligmann (mithrandi) :
review: Approve
Revision history for this message
Darren Dormer (ddormer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'methanal/themes/methanal-base/methanal-check-input.html'
2--- methanal/themes/methanal-base/methanal-check-input.html 2011-07-04 14:15:27 +0000
3+++ methanal/themes/methanal-base/methanal-check-input.html 2013-02-19 13:10:33 +0000
4@@ -1,6 +1,7 @@
5 <div xmlns:nevow="http://nevow.com/ns/nevow/0.1" xmlns:athena="http://divmod.org/ns/athena/0.7" nevow:render="liveElement">
6 <label class="methanal-check-input-label" nevow:render="checkLabel">
7 <input class="methanal-check-input" type="checkbox" nevow:render="value">
8+ <nevow:attr name="name" nevow:render="renderName" />
9 <athena:handler event="onclick" handler="onChange" />
10 </input>
11 </label>
12
13=== modified file 'methanal/themes/methanal-base/methanal-multicheck-input.html'
14--- methanal/themes/methanal-base/methanal-multicheck-input.html 2011-07-04 14:15:27 +0000
15+++ methanal/themes/methanal-base/methanal-multicheck-input.html 2013-02-19 13:10:33 +0000
16@@ -7,6 +7,7 @@
17 <div nevow:pattern="option">
18 <label>
19 <input type="checkbox">
20+ <nevow:attr name="name" nevow:render="renderName" />
21 <athena:handler event="onchange" handler="onChange" />
22 <nevow:attr name="value"><nevow:slot name="value" /></nevow:attr>
23 </input>
24
25=== modified file 'methanal/themes/methanal-base/methanal-multiselect-input.html'
26--- methanal/themes/methanal-base/methanal-multiselect-input.html 2011-07-11 11:33:39 +0000
27+++ methanal/themes/methanal-base/methanal-multiselect-input.html 2013-02-19 13:10:33 +0000
28@@ -1,5 +1,6 @@
29 <div xmlns:nevow="http://nevow.com/ns/nevow/0.1" xmlns:athena="http://divmod.org/ns/athena/0.7" nevow:render="liveElement">
30 <select class="methanal-input methanal-multiselect" multiple="multiple">
31+ <nevow:attr name="name" nevow:render="renderName" />
32 <athena:handler event="onchange" handler="onChange" />
33 <nevow:invisible nevow:render="options">
34 <optgroup nevow:pattern="optgroup">
35
36=== modified file 'methanal/themes/methanal-base/methanal-select-input.html'
37--- methanal/themes/methanal-base/methanal-select-input.html 2011-07-04 14:15:27 +0000
38+++ methanal/themes/methanal-base/methanal-select-input.html 2013-02-19 13:10:33 +0000
39@@ -1,5 +1,6 @@
40 <div xmlns:nevow="http://nevow.com/ns/nevow/0.1" xmlns:athena="http://divmod.org/ns/athena/0.7" nevow:render="liveElement">
41 <select class="methanal-input">
42+ <nevow:attr name="name" nevow:render="renderName" />
43 <athena:handler event="onchange" handler="onChange" />
44 <nevow:invisible nevow:render="options">
45 <optgroup nevow:pattern="optgroup">
46
47=== modified file 'methanal/themes/methanal-base/methanal-text-area-input.html'
48--- methanal/themes/methanal-base/methanal-text-area-input.html 2011-07-04 14:15:27 +0000
49+++ methanal/themes/methanal-base/methanal-text-area-input.html 2013-02-19 13:10:33 +0000
50@@ -1,5 +1,6 @@
51 <div xmlns:nevow="http://nevow.com/ns/nevow/0.1" xmlns:athena="http://divmod.org/ns/athena/0.7" nevow:render="liveElement">
52 <textarea class="methanal-input" type="text" nevow:render="value">
53+ <nevow:attr name="name" nevow:render="renderName" />
54 <athena:handler event="onchange" handler="onChange" />
55 </textarea>
56 </div>
57
58=== modified file 'methanal/themes/methanal-base/methanal-text-input.html'
59--- methanal/themes/methanal-base/methanal-text-input.html 2011-07-11 11:33:39 +0000
60+++ methanal/themes/methanal-base/methanal-text-input.html 2013-02-19 13:10:33 +0000
61@@ -1,6 +1,7 @@
62 <div xmlns:nevow="http://nevow.com/ns/nevow/0.1" xmlns:athena="http://divmod.org/ns/athena/0.7" nevow:render="liveElement">
63 <input class="methanal-input" type="text">
64 <nevow:attr name="value" nevow:render="value" />
65+ <nevow:attr name="name" nevow:render="renderName" />
66 <athena:handler event="onchange" handler="onChange" />
67 <athena:handler event="onkeyup" handler="onKeyUp" />
68 <athena:handler event="onblur" handler="onBlur" />
69
70=== modified file 'methanal/themes/methanal-base/methanal-verified-password-input.html'
71--- methanal/themes/methanal-base/methanal-verified-password-input.html 2011-07-11 11:33:39 +0000
72+++ methanal/themes/methanal-base/methanal-verified-password-input.html 2013-02-19 13:10:33 +0000
73@@ -1,6 +1,7 @@
74 <div xmlns:nevow="http://nevow.com/ns/nevow/0.1" xmlns:athena="http://divmod.org/ns/athena/0.7" nevow:render="liveElement">
75 <input class="methanal-input" type="password">
76 <nevow:attr name="value" nevow:render="value" />
77+ <nevow:attr name="name" nevow:render="renderName" />
78 <athena:handler event="onchange" handler="onChange" />
79 <athena:handler event="onkeyup" handler="onKeyUp" />
80 <athena:handler event="onblur" handler="onBlur" />
81
82=== modified file 'methanal/view.py'
83--- methanal/view.py 2012-07-13 20:54:14 +0000
84+++ methanal/view.py 2013-02-19 13:10:33 +0000
85@@ -522,6 +522,14 @@
86 return tag[value]
87
88
89+ @renderer
90+ def renderName(self, req, tag):
91+ """
92+ Render the input's name.
93+ """
94+ return tag[self.name]
95+
96+
97 def invoke(self, data):
98 """
99 Set the model parameter's value from form data.

Subscribers

People subscribed via source and target branches

to all changes: