Oops, missed a number of references to publisher :O

diff --git a/pgweb/account/views.py b/pgweb/account/views.py
index 2626169f4d8e76a73b8ac633594701b8192a7621..b76b749cc8f6e094a4b6d5d08db46c0e7e35af9d 100644 (file)
--- a/pgweb/account/views.py
+++ b/pgweb/account/views.py
@@ -34,8 +34,8 @@ def home(request):
        myarticles = NewsArticle.objects.filter(org__managers=request.user, approved=False)
        myevents = Event.objects.filter(org__managers=request.user, approved=False)
        myorgs = Organisation.objects.filter(managers=request.user, approved=False)
-       myproducts = Product.objects.filter(publisher__managers=request.user, approved=False)
-       myprofservs = ProfessionalService.objects.filter(organisation__managers=request.user, approved=False)
+       myproducts = Product.objects.filter(org__managers=request.user, approved=False)
+       myprofservs = ProfessionalService.objects.filter(org__managers=request.user, approved=False)
        return render_to_response('account/index.html', {
                'newsarticles': myarticles,
                'events': myevents,
@@ -55,11 +55,11 @@ objtypes = {
     },
        'products': {
                'title': 'Product',
-               'objects': lambda u: Product.objects.filter(publisher__managers=u),
+               'objects': lambda u: Product.objects.filter(org__managers=u),
        },
        'services': {
                'title': 'Professional service',
-               'objects': lambda u: ProfessionalService.objects.filter(organisation__managers=u),
+               'objects': lambda u: ProfessionalService.objects.filter(org__managers=u),
        },
        'organisations': {
                'title': 'Organisation',

diff --git a/pgweb/core/views.py b/pgweb/core/views.py
index 01cfd5aaf2391d5e06029e7af17643db76703557..90edbe6ecdcd741c221f715f17210e3515b5675c 100644 (file)
--- a/pgweb/core/views.py
+++ b/pgweb/core/views.py
@@ -217,7 +217,7 @@ def admin_mergeorg(request):
                                n.org = t
                                n.save()
                        for p in f.product_set.all():
-                               p.publisher = t
+                               p.org = t
                                p.save()
                        for p in f.professionalservice_set.all():
                                p.organisation = t

diff --git a/pgweb/downloads/forms.py b/pgweb/downloads/forms.py
index 7986578e3deb96734b43cc89ecc17819ba881fea..58e8544a470a348ced9313fda5da451befe8f7be 100644 (file)
--- a/pgweb/downloads/forms.py
+++ b/pgweb/downloads/forms.py
@@ -9,7 +9,7 @@ If you have not done so, use <a href="/account/organisations/new/">this form</a>
        def __init__(self, *args, **kwargs):
                super(ProductForm, self).__init__(*args, **kwargs)
        def filter_by_user(self, user):
-               self.fields['publisher'].queryset = Organisation.objects.filter(managers=user, approved=True)
+               self.fields['org'].queryset = Organisation.objects.filter(managers=user, approved=True)
        class Meta:
                model = Product
                exclude = ('lastconfirmed', 'approved', )

diff --git a/pgweb/downloads/views.py b/pgweb/downloads/views.py
index 85918c3bd98c4062ffa9d2214eb7f88cebed1bb1..867d4374928b007180ab92ee11fe0dc296231ad7 100644 (file)
--- a/pgweb/downloads/views.py
+++ b/pgweb/downloads/views.py
@@ -231,7 +231,7 @@ def categorylist(request):
 
 def productlist(request, catid, junk=None):
        category = get_object_or_404(Category, pk=catid)
-       products = Product.objects.select_related('publisher','licencetype').filter(category=category, approved=True)
+       products = Product.objects.select_related('org','licencetype').filter(category=category, approved=True)
        return render_to_response('downloads/productlist.html', {
                'category': category,
                'products': products,