Merge lp:~brendan-donegan/checkbox-editor/verification_interaction_plugins into lp:checkbox-editor

Proposed by Brendan Donegan
Status: Merged
Merged at revision: 151
Proposed branch: lp:~brendan-donegan/checkbox-editor/verification_interaction_plugins
Merge into: lp:checkbox-editor
Diff against target: 40 lines (+9/-0)
3 files modified
checkbox_editor/glade/editor.glade (+6/-0)
checkbox_editor/validation.py (+2/-0)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox-editor/verification_interaction_plugins
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+130840@code.launchpad.net

Description of the change

Add verification and interaction job types to the checkbox-editor UI and specify their validation rules in the validator code.

To post a comment you must log in.
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Let's not merge this until the debate over the exact plugin names is resolved

152. By Brendan Donegan

Changed verification/interaction to user-verify and user-interact.

Revision history for this message
Marc Tardif (cr3) wrote :

Looks good as far as my understanding of checkbox-editor goes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox_editor/glade/editor.glade'
2--- checkbox_editor/glade/editor.glade 2012-07-05 10:52:46 +0000
3+++ checkbox_editor/glade/editor.glade 2012-10-26 09:27:21 +0000
4@@ -37,6 +37,12 @@
5 <col id="0" translatable="yes">manual</col>
6 </row>
7 <row>
8+ <col id="0" translatable="yes">user-verify</col>
9+ </row>
10+ <row>
11+ <col id="0" translatable="yes">user-interact</col>
12+ </row>
13+ <row>
14 <col id="0" translatable="yes">shell</col>
15 </row>
16 <row>
17
18=== modified file 'checkbox_editor/validation.py'
19--- checkbox_editor/validation.py 2011-10-07 16:14:21 +0000
20+++ checkbox_editor/validation.py 2012-10-26 09:27:21 +0000
21@@ -15,6 +15,8 @@
22 'local': ('command', 'description'),
23 'remote': ('command', 'description'),
24 'manual': ('description',),
25+ 'user-verify': ('command', 'description'),
26+ 'user-interact': ('command', 'description'),
27 'shell': ('command', 'description'),
28 'attachment': ('command',),
29 'resource': ('command',),
30
31=== modified file 'debian/changelog'
32--- debian/changelog 2012-10-15 14:31:55 +0000
33+++ debian/changelog 2012-10-26 09:27:21 +0000
34@@ -64,6 +64,7 @@
35 [Brendan Donegan]
36 * Fix crash when loading a whitelist, due to trying to call append
37 on a non-list (LP: #1033863)
38+ * Added support for new user-verify and user-interact job types.
39
40 -- Sylvain Pineau <sylvain.pineau@canonical.com> Mon, 15 Oct 2012 16:31:12 +0200
41

Subscribers

People subscribed via source and target branches

to all changes: