Withdraw changes for autocompleting category fullpath in the category form

oscar/apps/dashboard/catalogue/app.py

@@ -46,9 +46,6 @@ class CatalogueApplication(Application):
                 name='catalogue-category-create'),
             url(r'^categories/update/(?P<pk>\d+)/$', self.category_update_view.as_view(),
                 name='catalogue-category-update'),
-
-            url(r'^categories-autocomplete/$', views.category_autocomplete,
-                name='catalogue-category-autocomplete'),
         )
         return self.post_process_urls(urlpatterns)
 

oscar/apps/dashboard/catalogue/forms.py

@@ -1,7 +1,6 @@
 from django import forms
 from django.forms.models import inlineformset_factory
 from django.db.models import get_model
-from django.utils.translation import ugettext as _
 
 from treebeard.forms import MoveNodeForm
 
@@ -15,32 +14,6 @@ ProductImage = get_model('catalogue', 'ProductImage')
 
 class CategoryForm(MoveNodeForm):
 
-    _ref_node_id = forms.CharField(required=False,
-                                   label=_(u"Relative to (category)"))
-
-    def __init__(self, *args, **kwargs):
-        super(CategoryForm, self).__init__(*args, **kwargs)
-        if self.initial:
-            ref_pk = self.initial['_ref_node_id']
-            if ref_pk:
-                try:
-                    c = Category.objects.get(pk=ref_pk)
-                except Category.DoesNotExist:
-                    self.initial['_ref_node_id'] = ''
-                else:
-                    self.initial['_ref_node_id'] = c.full_name
-
-    def clean__ref_node_id(self):
-        cd = self.cleaned_data
-        if '_ref_node_id' in cd and cd['_ref_node_id']:
-            try:
-                c = Category.objects.get(full_name=cd['_ref_node_id'])
-            except Category.DoesNotExist:
-                raise forms.ValidationError(_('The specified category does not exist'))
-            else:
-                cd['_ref_node_id'] = c.pk
-        return cd['_ref_node_id']
-
     class Meta(MoveNodeForm.Meta):
         model = Category
 

oscar/apps/dashboard/catalogue/views.py

@@ -1,14 +1,12 @@
 from django.views import generic
 from django.db.models import get_model
-from django.http import HttpResponseRedirect, HttpResponse
+from django.http import HttpResponseRedirect
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 
 from oscar.apps.dashboard.catalogue import forms
 from oscar.core.loading import get_classes
 
-import simplejson
-
 ProductForm, CategoryForm, StockRecordForm, StockAlertSearchForm, ProductCategoryFormSet, ProductImageFormSet = get_classes(
     'dashboard.catalogue.forms', ('ProductForm', 'CategoryForm', 'StockRecordForm',
                                   'StockAlertSearchForm',
@@ -281,10 +279,3 @@ class CategoryUpdateView(generic.UpdateView):
         else:
             return reverse("dashboard:catalogue-category-detail-list", 
                             args=(parent.pk,))
-
-
-def category_autocomplete(request):
-    q = request.GET.get('term', '')
-    categories =Category.objects.filter(full_name__icontains=q)
-    result = [c.full_name for c in categories]
-    return HttpResponse(simplejson.dumps(result))

oscar/static/oscar/js/oscar/dashboard.js

@@ -85,18 +85,6 @@ oscar.dashboard = {
                 }
             );
         }
-    },
-    catalogue: {
-        init: function() {
-        },
-        category_autocomplete: function(url) {
-            return function () {
-                $("#id__ref_node_id").autocomplete({
-                    'source': url,
-                    'minLength': 3,
-                });
-            }
-        }
     }
 };
 

oscar/templates/dashboard/catalogue/category_create.html

@@ -2,13 +2,6 @@
 {% load category_tags %}
 {% block body_class %}catalogue{% endblock %}
 
-{% block extrascripts %}
-    {{ block.super }}
-    <script type="text/javascript">
-        $(oscar.dashboard.catalogue.category_autocomplete("{% url dashboard:catalogue-category-autocomplete %}"));
-    </script>
-{% endblock %}
-
 {% block title %}
 Category management | {{ block.super }}
 {% endblock %}

oscar/templates/dashboard/catalogue/category_list.html

@@ -2,13 +2,6 @@
 {% load category_tags %}
 {% block body_class %}catalogue{% endblock %}
 
-{% block extrascripts %}
-    {{ block.super }}
-    <script src="{{ STATIC_URL }}oscar/js/jquery/jquery-ui-1.8.21.custom.min.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{ STATIC_URL }}oscar/js/sortable/jquery.ui.nestedSortable.js" type="text/javascript" charset="utf-8"></script>
-    <script type="text/javascript">$(oscar.dashboard.catalogue.init);</script>
-{% endblock %}
-
 {% block title %}
 Category management | {{ block.super }}
 {% endblock %}

oscar/templates/dashboard/layout.html

@@ -82,6 +82,6 @@ Dashboard | {{ block.super }}
     {{ block.super }}
     <script src="{{ STATIC_URL }}oscar/js/oscar/ui.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{ STATIC_URL }}oscar/js/oscar/dashboard.js" type="text/javascript" charset="utf-8"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/jquery-ui.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/jquery-ui.min.js"></script>
 	<script type="text/javascript">$(oscar.dashboard.init);</script>
 {% endblock %}

requirements.txt

@@ -14,4 +14,3 @@ PyHamcrest==1.6
 South==0.7.3
 purl==0.3.2
 django-sorting==0.1
-simplejson==2.5.2

setup.py

@@ -34,7 +34,6 @@ setup(name='django-oscar',
           'sorl-thumbnail==11.12',
           'python-memcached==1.48',
           'django-sorting==0.1',
-          'simplejson==2.5.2',
           ],
       # See http://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=['Environment :: Web Environment',