Unifield Web

Merge lp:~jfb-tempo-consulting/unifield-web/us-3145 into lp:unifield-web

  1. us-3145
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4850
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/us-3145
Merge into: lp:unifield-web
Diff against target: 34 lines (+4/-2)
2 files modified
addons/openerp/controllers/database.py (+1/-1)
openobject/validators.py (+3/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/us-3145
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+327110@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/database.py'
2--- addons/openerp/controllers/database.py 2017-01-02 14:59:00 +0000
3+++ addons/openerp/controllers/database.py 2017-07-10 14:18:46 +0000
4@@ -147,7 +147,7 @@
5 action = '/openerp/database/do_restore'
6 submit_text = _('Restore')
7 fields = [
8- FileField(name="filename", label=_('File:')),
9+ FileField(name="filename", label=_('File:'), validator=openobject.validators.IteratorValidator()),
10 ReplacePasswordField(name='password', label=_('Restore password:')),
11 openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), readonly=1, attrs={'readonly': ''})
12 ]
13
14=== modified file 'openobject/validators.py'
15--- openobject/validators.py 2011-01-17 11:57:11 +0000
16+++ openobject/validators.py 2017-07-10 14:18:46 +0000
17@@ -20,7 +20,7 @@
18 ###############################################################################
19 import formencode
20
21-__all__ = ['BaseValidator', 'DefaultValidator', 'Schema']
22+__all__ = ['BaseValidator', 'DefaultValidator', 'Schema', 'IteratorValidator']
23
24 class BaseValidator(formencode.api.FancyValidator):
25 pass
26@@ -29,6 +29,8 @@
27 class DefaultValidator(BaseValidator):
28 pass
29
30+class IteratorValidator(BaseValidator):
31+ accept_iterator = True
32
33 class Schema(formencode.schema.Schema):
34 """Modified Schema validator.

Subscribers

People subscribed via source and target branches