← Back to branch summary

~pidgeon690/mypidge-base/feature+publicity

« back to all changes in this revision

Viewing changes to MyPidge/Start/views.py

  • Committer: Fergus Ross Ferrier
  • Date: 2008-12-01 20:32:29 UTC
  • Revision ID: me@fergusrossferrier.co.uk-20081201203229-tz2yh5ylrdihckkw
User now exists in Person multi-table hierarchy.

We can add people without needing them to register. We can use existing data for a person when they try and register. It's a real bitch to use though.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MyPidge/Start/views.py
145
145
        if link in linkshave: link.has = True
146
146
        pidgeLinks.append(link)
147
147
 
148
 
    gsps = GroupServiceProperty.objects.filter(groupservice__group__membership__user = user, serviceproperty__display_on_group_page = True, serviceproperty__type='URL').distinct()
 
148
    gsps = GroupServiceProperty.objects.filter(groupservice__group__membership__person = user, serviceproperty__display_on_group_page = True, serviceproperty__type='URL').distinct()
149
149
 
150
150
    gsparray = {}
151
151
    for gsp in gsps:
234
234
 
235
235
    if request.session.get('loggedin'):
236
236
        user = User.objects.get(id = request.session['userid'])
237
 
        intevents = EventTime.objects.filter(event__group__membership__user=user, finish__gte = datetime.now()).distinct().order_by('start')[:5]
 
237
        intevents = EventTime.objects.filter(event__group__membership__person = user, finish__gte = datetime.now()).distinct().order_by('start')[:5]
238
238
    else:
239
239
        intevents = EventTime.objects.filter(finish__gte=datetime.now()).distinct().order_by('start')[:5]
240
240