~ubuntu-branches/ubuntu/natty/moin/natty-updates

« back to all changes in this revision

Viewing changes to MoinMoin/util/web.py

  • Committer: Bazaar Package Importer
  • Author(s): Jonas Smedegaard
  • Date: 2008-06-22 21:17:13 UTC
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20080622211713-inlv5k4eifxckelr
ImportĀ upstreamĀ versionĀ 1.7.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
        is missing).
15
15
    """
16
16
    try:
17
 
        result = int(request.values[fieldname])
 
17
        result = int(request.form[fieldname][0])
18
18
    except (KeyError, ValueError):
19
19
        return default
20
20
    else:
25
25
        return result
26
26
 
27
27
 
28
 
def makeSelection(name, values, selectedval=None, size=1, multiple=False, enabled=True):
 
28
def makeSelection(name, values, selectedval=None, size=1, multiple=False):
29
29
    """ Make a HTML <select> element named `name` from a value list.
30
30
        The list can either be a list of strings, or a list of
31
31
        (value, label) tuples.
33
33
        `selectedval` is the value that should be pre-selected.
34
34
    """
35
35
    from MoinMoin.widget import html
36
 
    result = html.SELECT(name=name, size="%d" % int(size), multiple=multiple, disabled=not enabled)
 
36
    result = html.SELECT(name=name, size="%d" % int(size), multiple=multiple)
37
37
    for val in values:
38
38
        if not isinstance(val, type(())):
39
39
            val = (val, val)
44
44
 
45
45
    return result
46
46
 
47
 
def makeMultiSelection(name, values, selectedvals=None, size=5, enabled=True):
 
47
def makeMultiSelection(name, values, selectedvals=None, size=5):
48
48
    """Make a HTML multiple <select> element with named `name` from a value list.
49
49
 
50
50
    The list can either be a list of strings, or a list of (value, label) tuples.
52
52
 
53
53
    """
54
54
    from MoinMoin.widget import html
55
 
    result = html.SELECT(name=name, size="%d" % int(size), multiple=True, disabled=not enabled)
 
55
    result = html.SELECT(name=name, size="%d" % int(size), multiple=True)
56
56
    for val in values:
57
57
        if not isinstance(val, type(())):
58
58
            val = (val, val)