1
=== modified file 'dashboard_app/filters.py'
2
--- dashboard_app/filters.py	2013-01-09 00:15:10 +0000
3
+++ dashboard_app/filters.py	2013-06-19 08:00:38 +0000
4
@@ -365,13 +365,15 @@
5
365
365
6
366
    content_type_id = ContentType.objects.get_for_model(TestRun).id
366
    content_type_id = ContentType.objects.get_for_model(TestRun).id
7
367
367
9
368
    for (name, value) in filter_data['attributes']:
368
    for (name, equation, value) in filter_data['attributes']:
10
369
        # We punch through the generic relation abstraction here for 100x
369
        # We punch through the generic relation abstraction here for 100x
11
370
        # better performance.
370
        # better performance.
16
371
        conditions.append(
371
        kwargs = {
17
372
            models.Q(id__in=NamedAttribute.objects.filter(
372
            'name': name,
18
373
                name=name, value=value, content_type_id=content_type_id
373
            '{0}__{1}'.format('value', equation): value,
19
374
                ).values('object_id')))
374
            'content_type_id': content_type_id
20
375
        }
21
376
        conditions.append(models.Q(id__in=NamedAttribute.objects.filter(**kwargs).values('object_id')))
22
375
377
23
376
    test_condition = None
378
    test_condition = None
24
377
    for test in filter_data.get('tests', []):
379
    for test in filter_data.get('tests', []):
25
378
380
26
=== added file 'dashboard_app/migrations/0030_auto__add_equation_to_testrunfilterattribute.py'
27
--- dashboard_app/migrations/0030_auto__add_equation_to_testrunfilterattribute.py	1970-01-01 00:00:00 +0000
28
+++ dashboard_app/migrations/0030_auto__add_equation_to_testrunfilterattribute.py	2013-06-19 08:00:38 +0000
29
@@ -0,0 +1,270 @@
30
1
# -*- coding: utf-8 -*-
31
2
import datetime
32
3
from south.db import db
33
4
from south.v2 import SchemaMigration
34
5
from django.db import models
35
6
36
7
37
8
class Migration(SchemaMigration):
38
9
39
10
    def forwards(self, orm):
40
11
        # Adding field 'TestRunFilterAttribute.equation'
41
12
        db.add_column('dashboard_app_testrunfilterattribute', 'equation',
42
13
                      self.gf('django.db.models.fields.CharField')(default='exact', max_length=6),
43
14
                      keep_default=False)
44
15
45
16
46
17
    def backwards(self, orm):
47
18
        # Deleting field 'TestRunFilterAttribute.equation'
48
19
        db.delete_column('dashboard_app_testrunfilterattribute', 'equation')
49
20
50
21
51
22
    models = {
52
23
        'auth.group': {
53
24
            'Meta': {'object_name': 'Group'},
54
25
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
55
26
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
56
27
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
57
28
        },
58
29
        'auth.permission': {
59
30
            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
60
31
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
61
32
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
62
33
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
63
34
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
64
35
        },
65
36
        'auth.user': {
66
37
            'Meta': {'object_name': 'User'},
67
38
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
68
39
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
69
40
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
70
41
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
71
42
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
72
43
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
73
44
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
74
45
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
75
46
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
76
47
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
77
48
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
78
49
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
79
50
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
80
51
        },
81
52
        'contenttypes.contenttype': {
82
53
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
83
54
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
84
55
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
85
56
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
86
57
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
87
58
        },
88
59
        'dashboard_app.attachment': {
89
60
            'Meta': {'object_name': 'Attachment'},
90
61
            'content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True'}),
91
62
            'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
92
63
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
93
64
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
94
65
            'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
95
66
            'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
96
67
            'public_url': ('django.db.models.fields.URLField', [], {'max_length': '512', 'blank': 'True'})
97
68
        },
98
69
        'dashboard_app.bundle': {
99
70
            'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'},
100
71
            '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}),
101
72
            '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}),
102
73
            'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}),
103
74
            'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
104
75
            'content_sha1': ('django.db.models.fields.CharField', [], {'max_length': '40', 'unique': 'True', 'null': 'True'}),
105
76
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
106
77
            'is_deserialized': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
107
78
            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'uploaded_bundles'", 'null': 'True', 'to': "orm['auth.User']"}),
108
79
            'uploaded_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
109
80
        },
110
81
        'dashboard_app.bundledeserializationerror': {
111
82
            'Meta': {'object_name': 'BundleDeserializationError'},
112
83
            'bundle': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'deserialization_error'", 'unique': 'True', 'primary_key': 'True', 'to': "orm['dashboard_app.Bundle']"}),
113
84
            'error_message': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
114
85
            'traceback': ('django.db.models.fields.TextField', [], {'max_length': '32768'})
115
86
        },
116
87
        'dashboard_app.bundlestream': {
117
88
            'Meta': {'object_name': 'BundleStream'},
118
89
            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
119
90
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
120
91
            'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
121
92
            'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
122
93
            'name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
123
94
            'pathname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
124
95
            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
125
96
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
126
97
        },
127
98
        'dashboard_app.hardwaredevice': {
128
99
            'Meta': {'object_name': 'HardwareDevice'},
129
100
            'description': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
130
101
            'device_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
131
102
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
132
103
        },
133
104
        'dashboard_app.image': {
134
105
            'Meta': {'object_name': 'Image'},
135
106
            'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'to': "orm['dashboard_app.TestRunFilter']"}),
136
107
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
137
108
            'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '1024'})
138
109
        },
139
110
        'dashboard_app.imageset': {
140
111
            'Meta': {'object_name': 'ImageSet'},
141
112
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
142
113
            'images': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['dashboard_app.Image']", 'symmetrical': 'False'}),
143
114
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'})
144
115
        },
145
116
        'dashboard_app.launchpadbug': {
146
117
            'Meta': {'object_name': 'LaunchpadBug'},
147
118
            'bug_id': ('django.db.models.fields.PositiveIntegerField', [], {'unique': 'True'}),
148
119
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
149
120
            'test_runs': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'launchpad_bugs'", 'symmetrical': 'False', 'to': "orm['dashboard_app.TestRun']"})
150
121
        },
151
122
        'dashboard_app.namedattribute': {
152
123
            'Meta': {'unique_together': "(('object_id', 'name'),)", 'object_name': 'NamedAttribute'},
153
124
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
154
125
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
155
126
            'name': ('django.db.models.fields.TextField', [], {}),
156
127
            'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
157
128
            'value': ('django.db.models.fields.TextField', [], {})
158
129
        },
159
130
        'dashboard_app.pmqabundlestream': {
160
131
            'Meta': {'object_name': 'PMQABundleStream'},
161
132
            'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['dashboard_app.BundleStream']"}),
162
133
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
163
134
        },
164
135
        'dashboard_app.softwarepackage': {
165
136
            'Meta': {'unique_together': "(('name', 'version'),)", 'object_name': 'SoftwarePackage'},
166
137
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
167
138
            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
168
139
            'version': ('django.db.models.fields.CharField', [], {'max_length': '128'})
169
140
        },
170
141
        'dashboard_app.softwarepackagescratch': {
171
142
            'Meta': {'object_name': 'SoftwarePackageScratch'},
172
143
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
173
144
            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
174
145
            'version': ('django.db.models.fields.CharField', [], {'max_length': '128'})
175
146
        },
176
147
        'dashboard_app.softwaresource': {
177
148
            'Meta': {'object_name': 'SoftwareSource'},
178
149
            'branch_revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
179
150
            'branch_url': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
180
151
            'branch_vcs': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
181
152
            'commit_timestamp': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
182
153
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
183
154
            'project_name': ('django.db.models.fields.CharField', [], {'max_length': '32'})
184
155
        },
185
156
        'dashboard_app.tag': {
186
157
            'Meta': {'object_name': 'Tag'},
187
158
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
188
159
            'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '256'})
189
160
        },
190
161
        'dashboard_app.test': {
191
162
            'Meta': {'object_name': 'Test'},
192
163
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
193
164
            'name': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
194
165
            'test_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'})
195
166
        },
196
167
        'dashboard_app.testcase': {
197
168
            'Meta': {'unique_together': "(('test', 'test_case_id'),)", 'object_name': 'TestCase'},
198
169
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
199
170
            'name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
200
171
            'test': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'test_cases'", 'to': "orm['dashboard_app.Test']"}),
201
172
            'test_case_id': ('django.db.models.fields.TextField', [], {}),
202
173
            'units': ('django.db.models.fields.TextField', [], {'blank': 'True'})
203
174
        },
204
175
        'dashboard_app.testdefinition': {
205
176
            'Meta': {'object_name': 'TestDefinition'},
206
177
            'content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
207
178
            'description': ('django.db.models.fields.TextField', [], {}),
208
179
            'environment': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
209
180
            'format': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
210
181
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
211
182
            'location': ('django.db.models.fields.CharField', [], {'default': "'LOCAL'", 'max_length': '64'}),
212
183
            'mime_type': ('django.db.models.fields.CharField', [], {'default': "'text/plain'", 'max_length': '64'}),
213
184
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}),
214
185
            'target_dev_types': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
215
186
            'target_os': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
216
187
            'url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
217
188
            'version': ('django.db.models.fields.CharField', [], {'max_length': '256'})
218
189
        },
219
190
        'dashboard_app.testresult': {
220
191
            'Meta': {'ordering': "('_order',)", 'object_name': 'TestResult'},
221
192
            '_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
222
193
            'filename': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
223
194
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
224
195
            'lineno': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
225
196
            'measurement': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '20', 'decimal_places': '10', 'blank': 'True'}),
226
197
            'message': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
227
198
            'microseconds': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
228
199
            'relative_index': ('django.db.models.fields.PositiveIntegerField', [], {}),
229
200
            'result': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
230
201
            'test_case': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'test_results'", 'null': 'True', 'to': "orm['dashboard_app.TestCase']"}),
231
202
            'test_run': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'test_results'", 'to': "orm['dashboard_app.TestRun']"}),
232
203
            'timestamp': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
233
204
        },
234
205
        'dashboard_app.testrun': {
235
206
            'Meta': {'ordering': "['-import_assigned_date']", 'object_name': 'TestRun'},
236
207
            'analyzer_assigned_date': ('django.db.models.fields.DateTimeField', [], {}),
237
208
            'analyzer_assigned_uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}),
238
209
            'bundle': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'test_runs'", 'to': "orm['dashboard_app.Bundle']"}),
239
210
            'devices': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'test_runs'", 'blank': 'True', 'to': "orm['dashboard_app.HardwareDevice']"}),
240
211
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
241
212
            'import_assigned_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
242
213
            'microseconds': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
243
214
            'packages': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'test_runs'", 'blank': 'True', 'to': "orm['dashboard_app.SoftwarePackage']"}),
244
215
            'sources': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'test_runs'", 'blank': 'True', 'to': "orm['dashboard_app.SoftwareSource']"}),
245
216
            'sw_image_desc': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
246
217
            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'test_runs'", 'blank': 'True', 'to': "orm['dashboard_app.Tag']"}),
247
218
            'test': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'test_runs'", 'to': "orm['dashboard_app.Test']"}),
248
219
            'time_check_performed': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
249
220
        },
250
221
        'dashboard_app.testrundenormalization': {
251
222
            'Meta': {'object_name': 'TestRunDenormalization'},
252
223
            'count_fail': ('django.db.models.fields.PositiveIntegerField', [], {}),
253
224
            'count_pass': ('django.db.models.fields.PositiveIntegerField', [], {}),
254
225
            'count_skip': ('django.db.models.fields.PositiveIntegerField', [], {}),
255
226
            'count_unknown': ('django.db.models.fields.PositiveIntegerField', [], {}),
256
227
            'test_run': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'denormalization'", 'unique': 'True', 'primary_key': 'True', 'to': "orm['dashboard_app.TestRun']"})
257
228
        },
258
229
        'dashboard_app.testrunfilter': {
259
230
            'Meta': {'unique_together': "(('owner', 'name'),)", 'object_name': 'TestRunFilter'},
260
231
            'build_number_attribute': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
261
232
            'bundle_streams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['dashboard_app.BundleStream']", 'symmetrical': 'False'}),
262
233
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
263
234
            'name': ('django.db.models.fields.SlugField', [], {'max_length': '1024'}),
264
235
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
265
236
            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
266
237
            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"})
267
238
        },
268
239
        'dashboard_app.testrunfilterattribute': {
269
240
            'Meta': {'object_name': 'TestRunFilterAttribute'},
270
241
            'equation': ('django.db.models.fields.CharField', [], {'default': "'exact'", 'max_length': '6'}),
271
242
            'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attributes'", 'to': "orm['dashboard_app.TestRunFilter']"}),
272
243
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
273
244
            'name': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
274
245
            'value': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
275
246
        },
276
247
        'dashboard_app.testrunfiltersubscription': {
277
248
            'Meta': {'unique_together': "(('user', 'filter'),)", 'object_name': 'TestRunFilterSubscription'},
278
249
            'filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['dashboard_app.TestRunFilter']"}),
279
250
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
280
251
            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
281
252
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
282
253
        },
283
254
        'dashboard_app.testrunfiltertest': {
284
255
            'Meta': {'object_name': 'TestRunFilterTest'},
285
256
            'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tests'", 'to': "orm['dashboard_app.TestRunFilter']"}),
286
257
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
287
258
            'index': ('django.db.models.fields.PositiveIntegerField', [], {}),
288
259
            'test': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['dashboard_app.Test']"})
289
260
        },
290
261
        'dashboard_app.testrunfiltertestcase': {
291
262
            'Meta': {'object_name': 'TestRunFilterTestCase'},
292
263
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
293
264
            'index': ('django.db.models.fields.PositiveIntegerField', [], {}),
294
265
            'test': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'cases'", 'to': "orm['dashboard_app.TestRunFilterTest']"}),
295
266
            'test_case': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['dashboard_app.TestCase']"})
296
267
        }
297
268
    }
298
269
299
270
    complete_apps = ['dashboard_app']
300
0
\ No newline at end of file
271
\ No newline at end of file
301
1
272
302
=== modified file 'dashboard_app/models.py'
303
--- dashboard_app/models.py	2013-04-01 08:50:05 +0000
304
+++ dashboard_app/models.py	2013-06-19 08:00:38 +0000
305
@@ -1566,11 +1566,17 @@
306
1566
1566
307
1567
    name = models.CharField(max_length=1024)
1567
    name = models.CharField(max_length=1024)
308
1568
    value = models.CharField(max_length=1024)
1568
    value = models.CharField(max_length=1024)
309
1569
    equation = models.CharField(
310
1570
            choices=(
311
1571
                ('lte', '<='),
312
1572
                ('exact', '=='),
313
1573
                ('gte', '>=')),
314
1574
            max_length=6, default='exact')
315
1569
1575
316
1570
    filter = models.ForeignKey("TestRunFilter", related_name="attributes")
1576
    filter = models.ForeignKey("TestRunFilter", related_name="attributes")
317
1571
1577
318
1572
    def __unicode__(self):
1578
    def __unicode__(self):
320
1573
        return '%s = %s' % (self.name, self.value)
1579
        return '%s %s %s' % (self.name, self.get_equation_display(), self.value)
321
1574
1580
322
1575
1581
323
1576
class TestRunFilterTest(models.Model):
1582
class TestRunFilterTest(models.Model):
324
@@ -1633,9 +1639,14 @@
325
1633
                'test': trftest.test,
1639
                'test': trftest.test,
326
1634
                'test_cases': [trftestcase.test_case for trftestcase in trftest.cases.all().select_related('test_case')],
1640
                'test_cases': [trftestcase.test_case for trftestcase in trftest.cases.all().select_related('test_case')],
327
1635
                })
1641
                })
328
1642
        att = []
329
1643
        for a in self.attributes.all():
330
1644
            b = (a.name, a.get_equation_display(), a.value)
331
1645
            att.append(b)
332
1636
        return {
1646
        return {
333
1637
            'bundle_streams': self.bundle_streams.all(),
1647
            'bundle_streams': self.bundle_streams.all(),
335
1638
            'attributes': self.attributes.all().values_list('name', 'value'),
1648
            'attributes': self.attributes.all().values_list('name', 'equation', 'value'),
336
1649
            'attr_display': att,
337
1639
            'tests': tests,
1650
            'tests': tests,
338
1640
            'build_number_attribute': self.build_number_attribute,
1651
            'build_number_attribute': self.build_number_attribute,
339
1641
            'uploaded_by': self.uploaded_by,
1652
            'uploaded_by': self.uploaded_by,
340
1642
1653
341
=== modified file 'dashboard_app/templates/dashboard_app/filter_form.html'
342
--- dashboard_app/templates/dashboard_app/filter_form.html	2012-09-19 22:56:03 +0000
343
+++ dashboard_app/templates/dashboard_app/filter_form.html	2013-06-19 08:00:38 +0000
344
@@ -42,6 +42,9 @@
345
42
                Name
42
                Name
346
43
              </th>
43
              </th>
347
44
              <th>
44
              <th>
348
45
                Equation
349
46
              </th>
350
47
              <th>
351
45
                Value
48
                Value
352
46
              </th>
49
              </th>
353
47
            </tr>
50
            </tr>
354
@@ -54,6 +57,9 @@
355
54
                {{ form.name }}
57
                {{ form.name }}
356
55
              </td>
58
              </td>
357
56
              <td class="value">
59
              <td class="value">
358
60
                {{ form.equation }}
359
61
              </td>
360
62
              <td class="value">
361
57
                {{ form.value }}
63
                {{ form.value }}
362
58
              </td>
64
              </td>
363
59
              <td>
65
              <td>
364
@@ -70,6 +76,9 @@
365
70
              <td class="name">
76
              <td class="name">
366
71
                {{ form.name }}
77
                {{ form.name }}
367
72
              </td>
78
              </td>
368
79
              <td class="equation">
369
80
                {{ form.equation }}
370
81
              </td>
371
73
              <td class="value">
82
              <td class="value">
372
74
                {{ form.value }}
83
                {{ form.value }}
373
75
              </td>
84
              </td>
374
76
85
375
=== modified file 'dashboard_app/templates/dashboard_app/filter_preview.html'
376
--- dashboard_app/templates/dashboard_app/filter_preview.html	2013-01-09 00:05:14 +0000
377
+++ dashboard_app/templates/dashboard_app/filter_preview.html	2013-06-19 08:00:38 +0000
378
@@ -14,7 +14,7 @@
379
14
<h1>Previewing new filter &ldquo;{{ form.name.value }}&rdquo;</h1>
14
<h1>Previewing new filter &ldquo;{{ form.name.value }}&rdquo;</h1>
380
15
{% endif %}
15
{% endif %}
381
16
16
383
17
{% include "dashboard_app/filter_summary.html" with summary_data=filter.as_data %}
17
{% include "dashboard_app/filter_summary.html" with filter_data=form.as_data %}
384
18
18
385
19
<p>
19
<p>
386
20
  These are the results matched by your filter.
20
  These are the results matched by your filter.
387
21
21
388
=== modified file 'dashboard_app/templates/dashboard_app/filter_summary.html'
389
--- dashboard_app/templates/dashboard_app/filter_summary.html	2012-12-12 23:49:01 +0000
390
+++ dashboard_app/templates/dashboard_app/filter_summary.html	2013-06-19 08:00:38 +0000
391
@@ -9,14 +9,14 @@
392
9
    {% endfor %}
9
    {% endfor %}
393
10
    </td>
10
    </td>
394
11
  </tr>
11
  </tr>
396
12
{% if filter_data.attributes %}
12
{% if filter_data.attr_display %}
397
13
  <tr>
13
  <tr>
398
14
    <th>
14
    <th>
399
15
      Attributes
15
      Attributes
400
16
    </th>
16
    </th>
401
17
    <td>
17
    <td>
404
18
    {% for a in filter_data.attributes %}
18
    {% for a in filter_data.attr_display %}
405
19
    {{ a.0 }} == {{ a.1 }} <br />
19
    {{ a.0 }} {{ a.1 }} {{ a.2 }} <br />
406
20
    {% endfor %}
20
    {% endfor %}
407
21
    </td>
21
    </td>
408
22
  </tr>
22
  </tr>
409
23
23
410
=== modified file 'dashboard_app/views/filters/forms.py'
411
--- dashboard_app/views/filters/forms.py	2013-01-09 00:14:58 +0000
412
+++ dashboard_app/views/filters/forms.py	2013-06-19 08:00:38 +0000
413
@@ -63,6 +63,11 @@
414
63
class AttributesForm(forms.Form):
63
class AttributesForm(forms.Form):
415
64
    name = forms.CharField(max_length=1024)
64
    name = forms.CharField(max_length=1024)
416
65
    value = forms.CharField(max_length=1024)
65
    value = forms.CharField(max_length=1024)
417
66
    equation = forms.ChoiceField(
418
67
            choices=[
419
68
                ('lte', '<='),
420
69
                ('exact', '=='),
421
70
                ('gte', '>=')])
422
66
71
423
67
AttributesFormSet = formset_factory(AttributesForm, extra=0)
72
AttributesFormSet = formset_factory(AttributesForm, extra=0)
424
68
73
425
@@ -170,7 +175,7 @@
426
170
        if commit:
175
        if commit:
427
171
            instance.attributes.all().delete()
176
            instance.attributes.all().delete()
428
172
            for a in self.attributes_formset.cleaned_data:
177
            for a in self.attributes_formset.cleaned_data:
430
173
                instance.attributes.create(name=a['name'], value=a['value'])
178
                instance.attributes.create(name=a['name'], equation=a['equation'], value=a['value'])
431
174
            instance.tests.all().delete()
179
            instance.tests.all().delete()
432
175
            for i, test_form in enumerate(self.tests_formset.forms):
180
            for i, test_form in enumerate(self.tests_formset.forms):
433
176
                trf_test = instance.tests.create(
181
                trf_test = instance.tests.create(
434
@@ -201,8 +206,15 @@
435
201
                    tc_form.cleaned_data['test_case']
206
                    tc_form.cleaned_data['test_case']
436
202
                    for tc_form in form.test_case_formset]
207
                    for tc_form in form.test_case_formset]
437
203
                    })
208
                    })
438
209
        att = []
439
210
        for form in self.attributes_formset.forms:
440
211
            att.append((
441
212
                form.cleaned_data['name'],
442
213
                dict(form.fields['equation'].choices)[form.cleaned_data['equation']],
443
214
                form.cleaned_data['value']))
444
215
        data['attr_display'] = att
445
204
        data['attributes'] = [
216
        data['attributes'] = [
447
205
            (d['name'], d['value']) for d in self.attributes_formset.cleaned_data]
217
            (d['name'], d['equation'], d['value']) for d in self.attributes_formset.cleaned_data]
448
206
        data['tests'] = tests
218
        data['tests'] = tests
449
207
        data['uploaded_by'] = None
219
        data['uploaded_by'] = None
450
208
        return data
220
        return data
451
@@ -218,6 +230,7 @@
452
218
            for attr in self.instance.attributes.all():
230
            for attr in self.instance.attributes.all():
453
219
                initial.append({
231
                initial.append({
454
220
                    'name': attr.name,
232
                    'name': attr.name,
455
233
                    'equation': attr.equation,
456
221
                    'value': attr.value,
234
                    'value': attr.value,
457
222
                    })
235
                    })
458
223
            attr_set_args['initial'] = initial
236
            attr_set_args['initial'] = initial
Reviewer	Review Type	Date Requested	Status
Stevan Radaković		2013-06-05	Approve on 2013-06-24
Review via email: mp+167494@code.launchpad.net