Skip to content

Commit d8d1a6c

Browse files
committed
Merge pull request tobami#184 from tobami/default-proj-error
Default proj error
2 parents b33a60c + fa5c6aa commit d8d1a6c

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

codespeed/admin.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ class RevisionAdmin(admin.ModelAdmin):
3030
class ExecutableAdmin(admin.ModelAdmin):
3131
list_display = ('name', 'description', 'id', 'project')
3232
list_filter = ('project',)
33-
search_fields = ('name', 'description', 'project')
33+
ordering = ['name']
34+
search_fields = ('name', 'description', 'project__name')
3435

3536
admin.site.register(Executable, ExecutableAdmin)
3637

@@ -47,6 +48,7 @@ class BenchmarkAdmin(admin.ModelAdmin):
4748

4849
class EnvironmentAdmin(admin.ModelAdmin):
4950
list_display = ('name', 'cpu', 'memory', 'os', 'kernel')
51+
ordering = ['name']
5052
search_fields = ('name', 'cpu', 'memory', 'os', 'kernel')
5153

5254
admin.site.register(Environment, EnvironmentAdmin)

codespeed/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Project(models.Model):
2929
blank=True, max_length=100)
3030
commit_browsing_url = models.CharField("Commit browsing URL",
3131
blank=True, max_length=200)
32-
track = models.BooleanField("Track changes", default=False)
32+
track = models.BooleanField("Track changes", default=True)
3333

3434
def __unicode__(self):
3535
return self.name

codespeed/views.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def comparison(request):
233233
return no_environment_error(request)
234234
checkedenviros = get_default_environment(enviros, data, multi=True)
235235

236-
if not len(Project.objects.all()):
236+
if not len(Project.objects.filter(track=True)):
237237
return no_default_project_error(request)
238238

239239
# Check whether there exist appropiate executables
@@ -639,6 +639,9 @@ def changes(request):
639639
return no_environment_error(request)
640640
defaultenv = get_default_environment(enviros, data)
641641

642+
if not len(Project.objects.filter(track=True)):
643+
return no_default_project_error(request)
644+
642645
defaultexecutable = getdefaultexecutable()
643646
if not defaultexecutable:
644647
return no_executables_error(request)

0 commit comments

Comments
 (0)