1
=== added file 'lib/offspring/web/media/js/jquery.placeholder.js'
2
--- lib/offspring/web/media/js/jquery.placeholder.js	1970-01-01 00:00:00 +0000
3
+++ lib/offspring/web/media/js/jquery.placeholder.js	2011-11-03 22:20:29 +0000
4
@@ -0,0 +1,106 @@
5
1
/*
6
2
* Placeholder plugin for jQuery
7
3
* ---
8
4
* Copyright 2010, Daniel Stocks (http://webcloud.se)
9
5
* Released under the MIT, BSD, and GPL Licenses.
10
6
*/
11
7
(function($) {
12
8
    function Placeholder(input) {
13
9
        this.input = input;
14
10
        if (input.attr('type') == 'password') {
15
11
            this.handlePassword();
16
12
        }
17
13
        // Prevent placeholder values from submitting
18
14
        $(input[0].form).submit(function() {
19
15
            if (input.hasClass('placeholder') && input[0].value == input.attr('placeholder')) {
20
16
                input[0].value = '';
21
17
            }
22
18
        });
23
19
    }
24
20
    Placeholder.prototype = {
25
21
        show : function(loading) {
26
22
            // FF and IE saves values when you refresh the page. If the user refreshes the page with
27
23
            // the placeholders showing they will be the default values and the input fields won't be empty.
28
24
            if (this.input[0].value === '' || (loading && this.valueIsPlaceholder())) {
29
25
                if (this.isPassword) {
30
26
                    try {
31
27
                        this.input[0].setAttribute('type', 'text');
32
28
                    } catch (e) {
33
29
                        this.input.before(this.fakePassword.show()).hide();
34
30
                    }
35
31
                }
36
32
                this.input.addClass('placeholder');
37
33
                this.input[0].value = this.input.attr('placeholder');
38
34
            }
39
35
        },
40
36
        hide : function() {
41
37
            if (this.valueIsPlaceholder() && this.input.hasClass('placeholder')) {
42
38
                this.input.removeClass('placeholder');
43
39
                this.input[0].value = '';
44
40
                if (this.isPassword) {
45
41
                    try {
46
42
                        this.input[0].setAttribute('type', 'password');
47
43
                    } catch (e) { }
48
44
                    // Restore focus for Opera and IE
49
45
                    this.input.show();
50
46
                    this.input[0].focus();
51
47
                }
52
48
            }
53
49
        },
54
50
        valueIsPlaceholder : function() {
55
51
            return this.input[0].value == this.input.attr('placeholder');
56
52
        },
57
53
        handlePassword: function() {
58
54
            var input = this.input;
59
55
            input.attr('realType', 'password');
60
56
            this.isPassword = true;
61
57
            // IE < 9 doesn't allow changing the type of password inputs
62
58
            if ($.browser.msie && input[0].outerHTML) {
63
59
                var fakeHTML = $(input[0].outerHTML.replace(/type=(['"])?password\1/gi, 'type=$1text$1'));
64
60
                this.fakePassword = fakeHTML.val(input.attr('placeholder')).addClass('placeholder').focus(function() {
65
61
                    input.trigger('focus');
66
62
                    $(this).hide();
67
63
                });
68
64
                $(input[0].form).submit(function() {
69
65
                    fakeHTML.remove();
70
66
                    input.show()
71
67
                });
72
68
            }
73
69
        }
74
70
    };
75
71
    var NATIVE_SUPPORT = !!("placeholder" in document.createElement( "input" ));
76
72
    $.fn.placeholder = function() {
77
73
        return NATIVE_SUPPORT ? this : this.each(function() {
78
74
            var input = $(this);
79
75
            var placeholder = new Placeholder(input);
80
76
            placeholder.show(true);
81
77
            input.focus(function() {
82
78
                placeholder.hide();
83
79
            });
84
80
            input.blur(function() {
85
81
                placeholder.show(false);
86
82
            });
87
83
88
84
            // On page refresh, IE doesn't re-populate user input
89
85
            // until the window.onload event is fired.
90
86
            if ($.browser.msie) {
91
87
                $(window).load(function() {
92
88
                    if(input.val()) {
93
89
                        input.removeClass("placeholder");
94
90
                    }
95
91
                    placeholder.show(true);
96
92
                });
97
93
                // What's even worse, the text cursor disappears
98
94
                // when tabbing between text inputs, here's a fix
99
95
                input.focus(function() {
100
96
                    if(this.value == "") {
101
97
                        var range = this.createTextRange();
102
98
                        range.collapse(true);
103
99
                        range.moveStart('character', 0);
104
100
                        range.select();
105
101
                    }
106
102
                });
107
103
            }
108
104
        });
109
105
    }
110
106
})(jQuery);
111
0
107
112
=== modified file 'lib/offspring/web/queuemanager/admin.py'
113
--- lib/offspring/web/queuemanager/admin.py	2011-02-24 05:08:42 +0000
114
+++ lib/offspring/web/queuemanager/admin.py	2011-11-03 22:20:29 +0000
115
@@ -43,7 +43,9 @@
116
43
43
117
44
44
118
45
class ProjectAdmin(admin.ModelAdmin):
45
class ProjectAdmin(admin.ModelAdmin):
120
46
    fields = ['title', 'name', 'arch', 'project_group', 'launchpad_project', 'suite', 'series', 'priority', 'status', 'is_active', 'config_url', 'notes']
46
    fields = ['title', 'name', 'arch', 'project_group', 'launchpad_project',
121
47
              'suite', 'series', 'priority', 'status', 'is_active',
122
48
              'config_url', 'lp_user', 'lp_ssh_key_input', 'notes']
123
47
    list_display = ('display_name', 'arch', 'series', 'project_group', 'launchpad_project', 'is_active', 'status', 'priority', 'config_url')
49
    list_display = ('display_name', 'arch', 'series', 'project_group', 'launchpad_project', 'is_active', 'status', 'priority', 'config_url')
124
48
    list_filter = ['arch', 'series', 'is_active', 'project_group', 'status']
50
    list_filter = ['arch', 'series', 'is_active', 'project_group', 'status']
125
49
    search_fields = ['title', 'name', 'arch', 'notes']
51
    search_fields = ['title', 'name', 'arch', 'notes']
126
50
52
127
=== modified file 'lib/offspring/web/queuemanager/forms.py'
128
--- lib/offspring/web/queuemanager/forms.py	2011-10-19 20:23:49 +0000
129
+++ lib/offspring/web/queuemanager/forms.py	2011-11-03 22:20:29 +0000
130
@@ -1,8 +1,11 @@
131
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
132
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
133
3
3
134
4
import re
135
5
136
4
from django.contrib.auth.models import User
6
from django.contrib.auth.models import User
137
5
from django.db import models
7
from django.db import models
138
8
from django import forms
139
6
from django.forms import (
9
from django.forms import (
140
7
    Form, ModelChoiceField, ModelForm, Textarea, TextInput, ValidationError)
10
    Form, ModelChoiceField, ModelForm, Textarea, TextInput, ValidationError)
141
8
from django.forms import fields
11
from django.forms import fields
142
@@ -15,9 +18,125 @@
143
15
18
144
16
from offspring.web.queuemanager.widgets import SelectWithAddNew
19
from offspring.web.queuemanager.widgets import SelectWithAddNew
145
17
20
149
18
class ProjectBaseForm(ModelForm):
21
class SSHPrivateKeyField(forms.Field):
150
19
    status = fields.CharField(max_length=200,
22
151
20
        widget=fields.Select(choices=Project.STATUS_CHOICES), required=True)
23
    def validate(self, value):
152
24
        "Check to see if the value looks like an SSH private key"
153
25
154
26
        # Use the parent's handling of required fields, etc.
155
27
        super(SSHPrivateKeyField, self).validate(value)
156
28
        if not value:  # If nothing is passed, don't try and validate it.
157
29
            return
158
30
159
31
        key_search_regexp = (r"-----BEGIN \w+ PRIVATE KEY-----"+
160
32
                             r".*"+
161
33
                             r"-----END \w+ PRIVATE KEY-----")
162
34
        is_key = re.search(key_search_regexp, value, re.DOTALL | re.MULTILINE)
163
35
164
36
        if not is_key:
165
37
            msg = ("The key you entered doesn't appear to be valid. I am "+
166
38
                   "expecting a key in the form:\n "+
167
39
                   "-----BEGIN <type> PRIVATE KEY-----\n"+
168
40
                   "<ASCII key>\n"+
169
41
                   "-----END <type> PRIVATE KEY-----\n")
170
42
            raise forms.ValidationError(msg)
171
43
172
44
class ProjectSSHCredForm(ModelForm):
173
45
    ssh_help = ("Enter a private SSH ASCII key block, complete with begin "+
174
46
                "and end markers.")
175
47
176
48
    lp_ssh_key_input = SSHPrivateKeyField(label="Launchpad User's SSH key",
177
49
                                       required=False,
178
50
                                       widget=forms.Textarea(
179
51
                                               attrs={'cols': 70, 'rows' : 4}),
180
52
                                       help_text=ssh_help)
181
53
182
54
    lp_fields_set = False
183
55
    lp_ssh_set = False
184
56
    lp_ssh_set_message = ("An SSH key is stored for this project. To replace "+
185
57
                          "it, paste a new SSH private key block here.")
186
58
    lp_ssh_clear_meessage = ("To enable access to private repositories,"+
187
59
                             "enter an SSH private key here in the form of an "+
188
60
                             "ASCII key block.")
189
61
190
62
    def __init__(self, *args, **kwargs):
191
63
        super(ProjectSSHCredForm, self).__init__(*args, **kwargs)
192
64
        # Set the form fields based on the model object
193
65
        if kwargs.has_key('instance'):
194
66
            self.has_instance = True
195
67
            instance = kwargs['instance']
196
68
            if instance.lp_ssh_key:
197
69
                self.lp_ssh_set = True
198
70
            else:
199
71
                self.lp_ssh_set = False
200
72
201
73
            if instance.lp_user:
202
74
                self.lp_user_set = True
203
75
            else:
204
76
                self.lp_user_set = False
205
77
206
78
            self.lp_fields_set = instance.lp_ssh_key or instance.lp_user
207
79
        else:
208
80
            self.has_instance = None
209
81
210
82
    def get_ssh_key_set(self):
211
83
        if self.has_instance:  # self.lp_user_set valid if instance exists
212
84
            return self.lp_ssh_set or self.data['lp_ssh_key_input']
213
85
        return self.data['lp_ssh_key_input'] != ""
214
86
215
87
    def get_lp_user_set(self):
216
88
        if self.has_instance:  # self.lp_user_set valid if instance exists
217
89
            return  self.lp_user_set or self.data['lp_user']
218
90
        return self.data['lp_user'] != ""
219
91
220
92
    def clean_lp_user(self):
221
93
        # We don't want to check that lp_user and SSH key are both set or clear
222
94
        # if we are on a project edit page that doesn't provide these fields.
223
95
        key_set = self.get_ssh_key_set()
224
96
        user_set = self.get_lp_user_set()
225
97
226
98
        if not user_set and key_set:
227
99
            raise forms.ValidationError("Launchpad User is required.")
228
100
229
101
        return self.cleaned_data['lp_user']
230
102
231
103
    def clean_lp_ssh_key_input(self):
232
104
        # We have to manually check the exclude list for lp_ssh_key_input
233
105
        # because it isn't excluded automatically, which seems to be the case
234
106
        # because it was defined in this class.
235
107
        if "lp_ssh_key_input" not in self.Meta.exclude:
236
108
            key_set = self.get_ssh_key_set()
237
109
            user_set = self.get_lp_user_set()
238
110
239
111
            if not key_set and user_set:
240
112
                raise forms.ValidationError("SSH Key is required.")
241
113
242
114
            return self.cleaned_data['lp_ssh_key_input']
243
115
    
244
116
    class Meta:
245
117
        model = Project
246
118
        widgets = {
247
119
            'lp_user' : Textarea(attrs={'cols': 70, 'rows' : 1}),
248
120
        }
249
121
250
122
class ProjectBaseForm(ProjectSSHCredForm):
251
123
    def save(self, commit=True):
252
124
        model = super(ProjectBaseForm, self).save(commit=False)
253
125
254
126
        if 'lp_ssh_key_input' in self.cleaned_data:
255
127
            # Save the SSH key
256
128
            new_key = self.cleaned_data['lp_ssh_key_input']
257
129
258
130
            if new_key == "":
259
131
                pass # No new key entered
260
132
261
133
            else: # Save new key (validated in clean_lp_ssh_key_input)
262
134
                model.lp_ssh_key = new_key
263
135
264
136
        if commit:
265
137
            model.save()
266
138
267
139
        return model
268
21
140
269
22
    class Meta:
141
    class Meta:
270
23
        model = Project
142
        model = Project
271
@@ -25,7 +144,8 @@
272
25
            'name' : TextInput(attrs={'style': 'text-transform: lowercase;'}),
144
            'name' : TextInput(attrs={'style': 'text-transform: lowercase;'}),
273
26
            'series' : TextInput(attrs={'style': 'text-transform: lowercase;'}),
145
            'series' : TextInput(attrs={'style': 'text-transform: lowercase;'}),
274
27
            'config_url': TextInput(attrs={'size': 50}),
146
            'config_url': TextInput(attrs={'size': 50}),
276
28
            'notes' : Textarea(attrs={'cols': 73, 'rows' : 4}),
147
            'notes' : Textarea(attrs={'cols': 70, 'rows' : 4}),
277
148
            'lp_user' : Textarea(attrs={'cols': 70, 'rows' : 1}),
278
29
        }
149
        }
279
30
150
280
31
    def clean_name(self):
151
    def clean_name(self):
281
@@ -52,7 +172,15 @@
282
52
    launchpad_project = ModelChoiceField(
172
    launchpad_project = ModelChoiceField(
283
53
        LaunchpadProject.objects, widget=SelectWithAddNew, required=False)
173
        LaunchpadProject.objects, widget=SelectWithAddNew, required=False)
284
54
    class Meta(ProjectBaseForm.Meta):
174
    class Meta(ProjectBaseForm.Meta):
286
55
        exclude = ('name', 'priority', 'is_active', 'access_groups')
175
        exclude = ('name', 'priority', 'is_active', 'access_groups',
287
176
                   'lp_user', 'lp_ssh_key_input')
288
177
289
178
290
179
class EditProjectSSHCredentialsForm(ProjectSSHCredForm):
291
180
    class Meta(ProjectSSHCredForm.Meta):
292
181
        exclude = ('priority', 'is_active', 'suite', 'access_groups', 'arch',
293
182
                   'config_url', 'name', 'priority', 'series', 'status',
294
183
                   'title')
295
56
184
296
57
185
297
58
class AccessGroupMemberForm(Form):
186
class AccessGroupMemberForm(Form):
298
59
187
299
=== modified file 'lib/offspring/web/queuemanager/models.py'
300
--- lib/offspring/web/queuemanager/models.py	2011-10-21 16:44:19 +0000
301
+++ lib/offspring/web/queuemanager/models.py	2011-11-03 22:20:29 +0000
302
@@ -233,7 +233,7 @@
303
233
    # The Launchpad User and SSH key are stored per project. If we stored them
233
    # The Launchpad User and SSH key are stored per project. If we stored them
304
234
    # per LauncpadProject, anyone who could create a Project referencing that
234
    # per LauncpadProject, anyone who could create a Project referencing that
305
235
    # LaunchpadProject could get access to the private data in it.
235
    # LaunchpadProject could get access to the private data in it.
307
236
    lp_user = models.TextField('Launchpad User', null=True, editable=False,
236
    lp_user = models.TextField('Launchpad User', null=True,
308
237
                               blank=True)
237
                               blank=True)
309
238
    lp_ssh_key = models.TextField("Launchpad User's SSH Key", blank=True,
238
    lp_ssh_key = models.TextField("Launchpad User's SSH Key", blank=True,
310
239
                                  null=True, editable=False)
239
                                  null=True, editable=False)
311
240
240
312
=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
313
--- lib/offspring/web/queuemanager/tests/test_views.py	2011-10-21 14:36:55 +0000
314
+++ lib/offspring/web/queuemanager/tests/test_views.py	2011-11-03 22:20:29 +0000
315
@@ -8,6 +8,8 @@
316
8
    Template,
8
    Template,
317
9
    )
9
    )
318
10
from django.test import TestCase
10
from django.test import TestCase
319
11
from django.test.client import Client
320
12
from django.contrib.auth.models import User
321
11
13
322
12
from offspring.enums import ProjectBuildStates
14
from offspring.enums import ProjectBuildStates
323
13
from offspring.web.queuemanager.models import (
15
from offspring.web.queuemanager.models import (
324
@@ -138,6 +140,108 @@
325
138
            status_code=200, msg_prefix=response.content)
140
            status_code=200, msg_prefix=response.content)
326
139
141
327
140
142
328
143
class ProjectEditSSHViewTests(TestCase):
329
144
    def test_edit_ssh_auth(self):
330
145
        project = factory.makeProject(is_private=True)
331
146
        user = project.owner
332
147
        grant_permission_to_user(user, 'change_project')
333
148
        self.assertTrue(
334
149
            self.client.login(username=user.username, password=user.username))
335
150
336
151
        key = ("-----BEGIN type PRIVATE KEY-----\n"+
337
152
               "12qwaszx34erdfcv\n"+
338
153
               "-----END type PRIVATE KEY-----\n")
339
154
340
155
        data = {'lp_user': "lpuser",
341
156
                'lp_ssh_key_input': key,
342
157
                '_save': 1}
343
158
        response = self.client.post(
344
159
            reverse('offspring.web.queuemanager.views.project_editsshcredentials',
345
160
                    args=[project.name]),
346
161
            data, follow=True)
347
162
348
163
        self.assertEqual(200, response.status_code)
349
164
350
165
        # re-load the project from the database to pick up changes
351
166
        user_visible_objects = Project.all_objects.accessible_by_user(user)
352
167
        project = get_possibly_private_object(
353
168
                    user, user_visible_objects, pk=project.name)
354
169
355
170
        self.assertEqual('lpuser', project.lp_user)
356
171
        self.assertEqual(key, project.lp_ssh_key)
357
172
358
173
    def test_edit_ssh_auth_bad_key(self):
359
174
        project = factory.makeProject(is_private=True)
360
175
        user = project.owner
361
176
        grant_permission_to_user(user, 'change_project')
362
177
        self.assertTrue(
363
178
            self.client.login(username=user.username, password=user.username))
364
179
365
180
        key = ("-----BEGIN type PR---VATE KEY-----\n"+
366
181
               "12qwaszx34erdfcv\n"+
367
182
               "-----END type PRIVATE KEY-----\n")
368
183
369
184
        data = {'lp_user': "lpuser",
370
185
                'lp_ssh_key_input': key,
371
186
                '_save': 1}
372
187
        response = self.client.post(
373
188
            reverse('offspring.web.queuemanager.views.project_editsshcredentials',
374
189
                    args=[project.name]),
375
190
            data, follow=True)
376
191
377
192
        self.assertEqual(200, response.status_code)
378
193
379
194
        # re-load the project from the database to pick up changes
380
195
        user_visible_objects = Project.all_objects.accessible_by_user(user)
381
196
        project = get_possibly_private_object(
382
197
                    user, user_visible_objects, pk=project.name)
383
198
384
199
        self.assertNotEqual('lpuser', project.lp_user)
385
200
        self.assertNotEqual(key, project.lp_ssh_key)
386
201
387
202
    def test_edit_ssh_auth_private_protected(self):
388
203
        project = factory.makeProject(is_private=True)
389
204
        user = factory.makeUser()
390
205
        self.assertTrue(
391
206
            self.client.login(username=user.username, password=user.username))
392
207
393
208
        # Check can't read a private projects ssh cred page
394
209
        response = self.client.get(
395
210
            reverse('offspring.web.queuemanager.views.project_editsshcredentials',
396
211
                    args=[project.name]), follow=True)
397
212
        self.assertEqual(200, response.status_code)
398
213
        self.assertContains(response, "Lexbuilder Control Administration")
399
214
        self.assertContains(response, "Username")
400
215
        self.assertContains(response, "Password")
401
216
402
217
        # Check can't write to a private projects ssh cred page
403
218
        key = ("-----BEGIN type PR---VATE KEY-----\n"+
404
219
               "12qwaszx34erdfcv\n"+
405
220
               "-----END type PRIVATE KEY-----\n")
406
221
407
222
        data = {'lp_user': "lpuser",
408
223
                'lp_ssh_key_input': key,
409
224
                '_save': 1}
410
225
        response = self.client.post(
411
226
            reverse('offspring.web.queuemanager.views.project_editsshcredentials',
412
227
                    args=[project.name]),
413
228
            data, follow=True)
414
229
415
230
        self.assertEqual(200, response.status_code)
416
231
        self.assertContains(response, "Lexbuilder Control Administration")
417
232
        self.assertContains(response, "Username")
418
233
        self.assertContains(response, "Password")
419
234
420
235
        # re-load the project from the database to pick up changes
421
236
        user_visible_objects = Project.all_objects.accessible_by_user(
422
237
                                project.owner)
423
238
        project = get_possibly_private_object(
424
239
                    project.owner, user_visible_objects, pk=project.name)
425
240
426
241
        self.assertNotEqual('lpuser', project.lp_user)
427
242
        self.assertNotEqual(key, project.lp_ssh_key)
428
243
429
244
430
141
class ProjectCreateViewTests(TestCase):
245
class ProjectCreateViewTests(TestCase):
431
142
    view_path = 'offspring.web.queuemanager.views.project_create'
246
    view_path = 'offspring.web.queuemanager.views.project_create'
432
143
247
433
@@ -156,7 +260,9 @@
434
156
                '_is_private': [u'on'],
260
                '_is_private': [u'on'],
435
157
                '_save': [u'Save'],
261
                '_save': [u'Save'],
436
158
                'series': [u'natty'],
262
                'series': [u'natty'],
438
159
                'arch': [u'amd64']}
263
                'arch': [u'amd64'],
439
264
                'lp_user': '',
440
265
                'lp_ssh_key_input': ''}
441
160
        response = self.client.post(reverse(self.view_path), data)
266
        response = self.client.post(reverse(self.view_path), data)
442
161
        self.assertContains(
267
        self.assertContains(
443
162
            response, 'A private project needs an owner',
268
            response, 'A private project needs an owner',
444
163
269
445
=== modified file 'lib/offspring/web/queuemanager/views.py'
446
--- lib/offspring/web/queuemanager/views.py	2011-10-20 16:08:24 +0000
447
+++ lib/offspring/web/queuemanager/views.py	2011-11-03 22:20:29 +0000
448
@@ -45,6 +45,7 @@
449
45
    AccessGroupMemberForm,
45
    AccessGroupMemberForm,
450
46
    CreateProjectForm,
46
    CreateProjectForm,
451
47
    EditProjectForm,
47
    EditProjectForm,
452
48
    EditProjectSSHCredentialsForm,
453
48
    LaunchpadProjectForm,
49
    LaunchpadProjectForm,
454
49
    ReleaseForm,
50
    ReleaseForm,
455
50
)
51
)
456
@@ -356,6 +357,52 @@
457
356
        'queuemanager/project_acl.html', pageData,
357
        'queuemanager/project_acl.html', pageData,
458
357
        context_instance=RequestContext(request))
358
        context_instance=RequestContext(request))
459
358
359
460
360
@permission_required('queuemanager.change_project')
461
361
def project_editsshcredentials(request, projectName):
462
362
    user_visible_objects = Project.all_objects.accessible_by_user(
463
363
        request.user)
464
364
    project = get_possibly_private_object(
465
365
        request.user, user_visible_objects, pk=projectName)
466
366
    access_group = None
467
367
    allowed_users = []
468
368
    if len(project.access_groups.all()) > 0:
469
369
        # We always use the first access group because there's no way for
470
370
        # users to register more than one access group for any given project.
471
371
        access_group = project.access_groups.all()[0]
472
372
        allowed_users = access_group.members.all()
473
373
474
374
    if request.method == 'POST':
475
375
476
376
        form = EditProjectSSHCredentialsForm(request.POST, instance=project)
477
377
478
378
        # Don't validate the data (call form.is_valid) before deleting - we
479
379
        # don't care what the form input is since we don't use it.
480
380
        if "delete" in request.POST:
481
381
            project.lp_user = ""
482
382
            project.lp_ssh_key = ""
483
383
            project.save()
484
384
            return HttpResponseRedirect(".")
485
385
486
386
        if form.is_valid():
487
387
            if "_save" in request.POST:
488
388
                project.lp_user = form.cleaned_data['lp_user']
489
389
                if form.cleaned_data['lp_ssh_key_input']:
490
390
                    project.lp_ssh_key = form.cleaned_data['lp_ssh_key_input']
491
391
                project.save()
492
392
493
393
            return HttpResponseRedirect(".")
494
394
495
395
    else:
496
396
        form = EditProjectSSHCredentialsForm(instance=project)
497
397
    pageData = {
498
398
        'csrf_token' : csrf.get_token(request),
499
399
        'project' : project,
500
400
        'form': form,
501
401
        'allowed_users': allowed_users,
502
402
        }
503
403
    return render_to_response(
504
404
        'queuemanager/project_edit_credentials.html', pageData,
505
405
        context_instance=RequestContext(request))
506
359
406
507
360
def projectgroup_details(request, projectGroupName):
407
def projectgroup_details(request, projectGroupName):
508
361
    pg = get_object_or_404(
408
    pg = get_object_or_404(
509
362
409
510
=== modified file 'lib/offspring/web/templates/queuemanager/project_create.html'
511
--- lib/offspring/web/templates/queuemanager/project_create.html	2011-02-28 22:48:46 +0000
512
+++ lib/offspring/web/templates/queuemanager/project_create.html	2011-11-03 22:20:29 +0000
513
@@ -5,7 +5,9 @@
514
5
{% endblock %}
5
{% endblock %}
515
6
6
516
7
{% block header_js %}
7
{% block header_js %}
518
8
<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script> 
8
<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script>
519
9
<script type="text/javascript" src="/media/js/jquery.min.js"></script>
520
10
<script type="text/javascript" src="/assets/js/jquery.placeholder.js"></script>
521
9
<script type="text/javascript">
11
<script type="text/javascript">
522
10
/* Override showAddAnotherPopup to use custom height and width. */
12
/* Override showAddAnotherPopup to use custom height and width. */
523
11
function showAddAnotherPopup(triggeringLink) {
13
function showAddAnotherPopup(triggeringLink) {
524
@@ -29,29 +31,68 @@
525
29
{% endblock %}
31
{% endblock %}
526
30
32
527
31
{% block content %}
33
{% block content %}
529
32
    <form method="POST" action="">{% csrf_token %}
34
    <form method="POST" action="" name="projsettings">{% csrf_token %}
530
33
        <div class="module aligned ">
35
        <div class="module aligned ">
531
34
             {% for field in form %}
36
             {% for field in form %}
540
35
                <div class="form-row {% if line.errors %} errors{% endif %} {{ field.name }}">
37
                {% if field.html_name == "lp_user" or field.html_name == "lp_ssh_key_input" %}
541
36
                    <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
38
                    <!-- This catches lp_user and lp_ssh_key_input so they aren't shown in the top of
542
37
                        {% if field.is_checkbox %}
39
                    the page. They are displayed below in their own section after some help text -->
543
38
                            {{ field }}{{ field.label_tag }}
40
                {% else %}
544
39
                        {% else %}
41
                    <div class="form-row {% if line.errors %} errors{% endif %} {{ field.name }}">
545
40
                            {{ field.label_tag }}
42
                        <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
546
41
                            {% if field.is_readonly %}
43
                            {% if field.is_checkbox %}
547
42
                                <p>{{ field.contents }}</p>
44
                                {{ field }}{{ field.label_tag }}
548
43
                            {% else %}
45
                            {% else %}
555
44
                                {{ field }}
46
                                {{ field.label_tag }}
556
45
                            {% endif %}
47
                                {% if field.is_readonly %}
557
46
                        {% endif %}
48
                                    <p>{{ field.contents }}</p>
558
47
                        {% if field.field.field.help_text %}
49
                                {% else %}
559
48
                            <p class="help">{{ field.field.field.help_text|safe }}</p>
50
                                    {{ field }}
560
49
                        {% endif %}
51
                                {% endif %}
561
52
                            {% endif %}
562
53
                            {% if field.field.field.help_text %}
563
54
                                <p class="help">{{ field.field.field.help_text|safe }}</p>
564
55
                            {% endif %}
565
56
                        </div>
566
57
                        {{ field.errors }}
567
50
                    </div>
58
                    </div>
570
51
                    {{ field.errors }}
59
                {% endif %}
569
52
                </div>
571
53
                
60
                
572
54
            {% endfor %}
61
            {% endfor %}
573
62
574
63
            <br>
575
64
            If the config URL above points to a Bazaar repository that is only
576
65
            available to authenticated users, you should add a user and private SSH
577
66
            key to give the builder access. The SSH key will never be revealed. It
578
67
            can be changed or deleted later. It should not be passphrase protected.
579
68
            If you would like to add these details, tick here:
580
69
581
70
            <br>
582
71
583
72
            <div class="form-row {{ form.lp_user.name }}">
584
73
                <div class="field-box">
585
74
                    {{ form.lp_user.label_tag }}
586
75
                    <br>
587
76
                    {{ form.lp_user }}
588
77
                </div>
589
78
                {{ form.lp_user.errors }}
590
79
            </div>
591
80
592
81
            <div class="form-row {{ form.lp_ssh_key_input.name }}">
593
82
                <div class="field-box">
594
83
                    {{ form.lp_ssh_key_input.label_tag }}
595
84
                    <br>
596
85
                    <textarea id="id_lp_ssh_key_input" rows="4" cols="70" name="lp_ssh_key_input"
597
86
                              placeholder="{% if form.lp_ssh_set %}{{ form.lp_ssh_set_message }}{% else %}{{ form.lp_ssh_clear_meessage }}{% endif %}"></textarea>
598
87
                    {% if form.lp_ssh_key_input.help_text %}
599
88
                        <p class="help">{{ form.lp_ssh_key_input.help_text|safe }}</p>
600
89
                    {% endif %}
601
90
                </div>
602
91
                {{ form.lp_ssh_key_input.errors|linebreaksbr }}
603
92
            </div>
604
93
605
94
            <br>
606
95
607
55
            <div class="submit-row" style="overflow: auto;">
96
            <div class="submit-row" style="overflow: auto;">
608
56
                <input type="submit" value="Save" class="default" name="_save"/>
97
                <input type="submit" value="Save" class="default" name="_save"/>
609
57
                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '/';"/>
98
                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '/';"/>
610
58
99
611
=== modified file 'lib/offspring/web/templates/queuemanager/project_edit.html'
612
--- lib/offspring/web/templates/queuemanager/project_edit.html	2011-03-03 01:50:40 +0000
613
+++ lib/offspring/web/templates/queuemanager/project_edit.html	2011-11-03 22:20:29 +0000
614
@@ -5,7 +5,7 @@
615
5
{% endblock %}
5
{% endblock %}
616
6
6
617
7
{% block header_js %}
7
{% block header_js %}
619
8
<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script> 
8
<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script>
620
9
<script type="text/javascript">
9
<script type="text/javascript">
621
10
/* Override showAddAnotherPopup to use custom height and width. */
10
/* Override showAddAnotherPopup to use custom height and width. */
622
11
function showAddAnotherPopup(triggeringLink) {
11
function showAddAnotherPopup(triggeringLink) {
623
@@ -29,29 +29,46 @@
624
29
{% endblock %}
29
{% endblock %}
625
30
30
626
31
{% block content %}
31
{% block content %}
628
32
    <form method="POST" action="">{% csrf_token %}
32
    <form method="POST" action="" name="projsettings">{% csrf_token %}
629
33
        <div class="module aligned ">
33
        <div class="module aligned ">
630
34
             {% for field in form %}
34
             {% for field in form %}
639
35
                <div class="form-row {% if line.errors %} errors{% endif %} {{ field.name }}">
35
                {% if field.html_name == "lp_user" or field.html_name == "lp_ssh_key_input"%}
640
36
                    <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
36
                {% else %}
641
37
                        {% if field.is_checkbox %}
37
                    <div class="form-row {% if line.errors %} errors{% endif %} {{ field.name }}">
642
38
                            {{ field }}{{ field.label_tag }}
38
                        <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
643
39
                        {% else %}
39
                            {% if field.is_checkbox %}
644
40
                            {{ field.label_tag }}
40
                                {{ field }}{{ field.label_tag }}
637
41
                            {% if field.is_readonly %}
638
42
                                <p>{{ field.contents }}</p>
645
43
                            {% else %}
41
                            {% else %}
652
44
                                {{ field }}
42
                                {{ field.label_tag }}
653
45
                            {% endif %}
43
                                {% if field.is_readonly %}
654
46
                        {% endif %}
44
                                    <p>{{ field.contents }}</p>
655
47
                        {% if field.field.field.help_text %}
45
                                {% else %}
656
48
                            <p class="help">{{ field.field.field.help_text|safe }}</p>
46
                                    {{ field }}
657
49
                        {% endif %}
47
                                {% endif %}
658
48
                            {% endif %}
659
49
                            {% if field.help_text %}
660
50
                                <p class="help">{{ field.help_text|safe }}</p>
661
51
                            {% endif %}
662
52
                        </div>
663
53
                        {{ field.errors }}
664
50
                    </div>
54
                    </div>
667
51
                    {{ field.errors }}
55
                {%  endif %}
666
52
                </div>
668
53
                
56
                
669
54
            {% endfor %}
57
            {% endfor %}
670
58
671
59
            <br>
672
60
            If the config URL above points to a Bazaar repository that is only
673
61
            available to authenticated users, you should add a user and private SSH
674
62
            key to give the builder access. The SSH key will never be revealed. It
675
63
            can be changed or deleted later. It should not be passphrase protected.
676
64
677
65
            {% if form.lp_fields_set %}
678
66
                To update or delete these details, use
679
67
            {% else %}
680
68
                If you would like to add these details, 
681
69
            {% endif %}
682
70
            <a href="+editcredentials">use this form.</a>
683
71
684
55
            <div class="submit-row" style="overflow: auto;">
72
            <div class="submit-row" style="overflow: auto;">
685
56
                <input type="submit" value="Save" class="default" name="_save"/>
73
                <input type="submit" value="Save" class="default" name="_save"/>
686
57
                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url offspring.web.queuemanager.views.project_details project.name %}';"/>
74
                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url offspring.web.queuemanager.views.project_details project.name %}';"/>
687
58
75
688
=== added file 'lib/offspring/web/templates/queuemanager/project_edit_credentials.html'
689
--- lib/offspring/web/templates/queuemanager/project_edit_credentials.html	1970-01-01 00:00:00 +0000
690
+++ lib/offspring/web/templates/queuemanager/project_edit_credentials.html	2011-11-03 22:20:29 +0000
691
@@ -0,0 +1,64 @@
692
1
{% extends "base.html" %}
693
2
694
3
{% block header_css %}
695
4
<link rel="stylesheet" type="text/css" href="/media/css/forms.css" />
696
5
{% endblock %}
697
6
698
7
{% block header_js %}
699
8
<script type="text/javascript" src="/media/js/jquery.min.js"></script>
700
9
<script type="text/javascript" src="/assets/js/jquery.placeholder.js"></script>
701
10
{% endblock %}
702
11
703
12
{% block title %}
704
13
Update SSH Credentials for {{project.title|capfirst}}
705
14
{% endblock %}
706
15
707
16
{% block content %}
708
17
    <form method="POST" action="" name="projsettings">{% csrf_token %}
709
18
        {{ formset.non_form_errors }}
710
19
        <div class="module aligned ">
711
20
            <div class="form-row {{ form.lp_user.name }}">
712
21
                <div class="field-box">
713
22
                    {{ form.lp_user.label_tag }}
714
23
                    <br>
715
24
                    {{ form.lp_user }}
716
25
                </div>
717
26
                {{ form.lp_user.errors }}
718
27
            </div>
719
28
720
29
            <div class="form-row {{ form.lp_ssh_key_input.name }}">
721
30
                <div class="field-box">
722
31
                    {{ form.lp_ssh_key_input.label_tag }}
723
32
                    <br>
724
33
                    <textarea id="id_lp_ssh_key_input" rows="4" cols="70" name="lp_ssh_key_input"
725
34
                              placeholder="{% if form.lp_ssh_set %}{{ form.lp_ssh_set_message }}{% else %}{{ form.lp_ssh_clear_meessage }}{% endif %}"></textarea>
726
35
                    {% if form.lp_ssh_key_input.help_text %}
727
36
                        <p class="help">
728
37
                            {{ form.lp_ssh_key_input.help_text|safe }}
729
38
                                {% if form.lp_ssh_set %}
730
39
                                    Your saved key is not shown. To replace it, paste a new key in the above box.
731
40
                                {% else %}
732
41
                                    No key is stored for this project. Saved keys are not shown.
733
42
                                {% endif %}
734
43
                        </p>
735
44
                    {% endif %}
736
45
                </div>
737
46
                {{ form.lp_ssh_key_input.errors|linebreaksbr }}
738
47
            </div>
739
48
740
49
            <br>
741
50
742
51
            <div class="submit-row" style="overflow: auto;">
743
52
                <input type="submit" value="Save Updated Credentials" class="default" name="_save"/>
744
53
                <input type="submit" value="Delete Existing Credentials" class="default" name="delete"/>
745
54
                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url offspring.web.queuemanager.views.project_details project.name %}';"/>
746
55
            </div>
747
56
        </div>
748
57
    </form>
749
58
{% endblock %}
750
59
751
60
{% block two-columns %}
752
61
<script>
753
62
    $('input[placeholder], textarea[placeholder]').placeholder();
754
63
</script>
755
64
{% endblock %}
756
0
65
757
=== modified file 'lib/offspring/web/urls.py'
758
--- lib/offspring/web/urls.py	2011-10-18 15:17:15 +0000
759
+++ lib/offspring/web/urls.py	2011-11-03 22:20:29 +0000
760
@@ -79,6 +79,7 @@
761
79
    (r'^projects/(?P<projectName>[^/]+)/\+api/buildrequest/(?P<request_id>[^/]+)/$', buildrequest_handler),
79
    (r'^projects/(?P<projectName>[^/]+)/\+api/buildrequest/(?P<request_id>[^/]+)/$', buildrequest_handler),
762
80
    (r'^projects/(?P<projectName>[^/]+)/\+build$', 'offspring.web.queuemanager.views.queue_build'),
80
    (r'^projects/(?P<projectName>[^/]+)/\+build$', 'offspring.web.queuemanager.views.queue_build'),
763
81
    (r'^projects/(?P<projectName>[^/]+)/\+builds$', 'offspring.web.queuemanager.views.builds'),
81
    (r'^projects/(?P<projectName>[^/]+)/\+builds$', 'offspring.web.queuemanager.views.builds'),
764
82
    (r'^projects/(?P<projectName>[^/]+)/\+editcredentials$', 'offspring.web.queuemanager.views.project_editsshcredentials'),
765
82
    (r'^projects/(?P<projectName>[^/]+)/$', 'offspring.web.queuemanager.views.project_details'),
83
    (r'^projects/(?P<projectName>[^/]+)/$', 'offspring.web.queuemanager.views.project_details'),
766
83
    (r'^projects/$', 'offspring.web.queuemanager.views.projects'),
84
    (r'^projects/$', 'offspring.web.queuemanager.views.projects'),
767
84
    (r'^schedule/\+api/milestones/$', milestone_handler),
85
    (r'^schedule/\+api/milestones/$', milestone_handler),
Status:	Merged
Merged at revision:	75
Proposed branch:	lp:~dooferlad/offspring/ssh_ui_mods
Merge into:	lp:~linaro-automation/offspring/private-builds
Diff against target:	767 lines (+556/-44) 10 files modified lib/offspring/web/media/js/jquery.placeholder.js (+106/-0) lib/offspring/web/queuemanager/admin.py (+3/-1) lib/offspring/web/queuemanager/forms.py (+133/-5) lib/offspring/web/queuemanager/models.py (+1/-1) lib/offspring/web/queuemanager/tests/test_views.py (+107/-1) lib/offspring/web/queuemanager/views.py (+47/-0) lib/offspring/web/templates/queuemanager/project_create.html (+59/-18) lib/offspring/web/templates/queuemanager/project_edit.html (+35/-18) lib/offspring/web/templates/queuemanager/project_edit_credentials.html (+64/-0) lib/offspring/web/urls.py (+1/-0)
To merge this branch:	bzr merge lp:~dooferlad/offspring/ssh_ui_mods
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Guilherme Salgado	2011-11-03	Pending
James Tunnicliffe		Pending
Review via email: mp+81217@code.launchpad.net