Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Commit

Permalink
Merge branch '1.3' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Dawson committed Nov 28, 2012
2 parents 704b623 + b5e71ff commit 31cc12e
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 5 deletions.
20 changes: 20 additions & 0 deletions moztrap/model/attachments/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models


class Migration(SchemaMigration):

def forwards(self, orm):
pass

def backwards(self, orm):
pass

models = {

}

complete_apps = ['attachments']
7 changes: 6 additions & 1 deletion moztrap/view/manage/runs/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,12 @@ def save(self, user=None):

class AddRunForm(RunForm):
"""Form for adding a run."""
pass
def __init__(self, *args, **kwargs):
"""Initialize AddRunForm; default to being a series."""
super(AddRunForm, self).__init__(*args, **kwargs)

isf = self.fields["is_series"]
isf.initial = True



Expand Down
9 changes: 6 additions & 3 deletions static/js/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ var MT = (function (MT, $) {
fakePlaceholder: true,
initialFocus: true,
inputsNeverRemoved: true,
prefix: 'filter'
prefix: 'filter',
debounce: true
});
$('#clientfilter').customAutocomplete({
textbox: '#text-filter',
Expand All @@ -39,7 +40,8 @@ var MT = (function (MT, $) {
fakePlaceholder: true,
initialFocus: true,
inputsNeverRemoved: true,
prefix: 'filter'
prefix: 'filter',
debounce: true
});
$('.tagging').customAutocomplete({
textbox: '#id_add_tags',
Expand Down Expand Up @@ -84,7 +86,8 @@ var MT = (function (MT, $) {
allowNew: true,
triggerSubmit: null,
inputsNeverRemoved: true,
prefix: 'filter'
prefix: 'filter',
debounce: true
});
$('.runsdrill').html5finder({
loading: true,
Expand Down
2 changes: 1 addition & 1 deletion static/js/jquery.custom-autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
}
}
};
if (options.ajax) {
if (options.ajax || options.debounce) {
$(this).doTimeout('autocomplete', 200, function () {
updateSuggestionList();
});
Expand Down

0 comments on commit 31cc12e

Please sign in to comment.