VladPolskiy/postgres-web
1
0
Fork 0
mirror of https://github.com/postgres/pgweb.git synced 2025-08-13 13:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops, missed a number of references to publisher :O

Browse Source
This commit is contained in:
Magnus Hagander
2012-06-26 14:59:35 +02:00
parent 3c5cf33c37
commit 1678c93db6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pgweb/account/views.py
View File

@ -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',

2
pgweb/core/views.py
View File

@ -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

2
pgweb/downloads/forms.py
View File

@ -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', )

2
pgweb/downloads/views.py
View File

@ -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,