- fixed agenda autocomplete

- fixed travis build
kunitoki · Jan 30, 2015 · 65b3ef9 · 65b3ef9
1 parent 7190596
commit 65b3ef9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ install:
   - pip install -q Django==$DJANGO
   - pip install coveralls
   - pip install .
-  - pip install -r example/requirements.txt
+  - pip install -r requirements.txt
 script:
   - coverage run --timid --source=nublas manage.py test nublas
 after_success:

diff --git a/nublas/templates/nublas/skins/default/views/agenda/event_view.html b/nublas/templates/nublas/skins/default/views/agenda/event_view.html
@@ -75,7 +75,7 @@
                     minimumInputLength: 2,
                     allowClear: true,
                     ajax: {
-                        url: "",
+                        url: "{% url 'nublas:contact_search_autocomplete' association.uuid %}",
                         dataType: 'json',
                         data: function (term, page) {
                             return {

diff --git a/nublas/ui/views/agenda.py b/nublas/ui/views/agenda.py
@@ -377,7 +377,8 @@ def dispatch(self, request, *args, **kwargs):
                                                     prefix='contacts')
 
         return render_to_response(get_skin_relative_path('views/agenda/event_view.html'),
-            RequestContext(request, { 'inline_form': inline_form,
+            RequestContext(request, { 'association': a,
+                                      'inline_form': inline_form,
                                       #'custom_form': custom_form,
                                       'contact_formset': contact_formset,
                                       'title': _('Adding new event for '),
@@ -434,7 +435,8 @@ def dispatch(self, request, *args, **kwargs):
             contact_formset = contact_formset_class(instance=o, association=a, prefix='contacts')
 
         return render_to_response(get_skin_relative_path('views/agenda/event_view.html'),
-            RequestContext(request, { 'inline_form': inline_form,
+            RequestContext(request, { 'association': a,
+                                      'inline_form': inline_form,
                                       #'custom_form': custom_form,
                                       'contact_formset': contact_formset,
                                       'title': _('Edit event for '),