Revision 88305cf0

b/snf-astakos-app/astakos/im/forms.py
596 596
    q = forms.CharField(max_length=200, label='Search group')
597 597

  
598 598
class TimelineForm(forms.Form):
599
    entity = forms.CharField(
600
        widget=forms.HiddenInput(), label='')
599
#    entity = forms.CharField(
600
#        widget=forms.HiddenInput(), label='')
601
    entity = forms.ModelChoiceField(
602
        queryset=AstakosUser.objects.filter(is_active = True)
603
    )
601 604
    resource = forms.ModelChoiceField(
602 605
        queryset=Resource.objects.all()
603 606
    )
......
619 622
            d['start_date'] = d['start_date'].strftime("%Y-%m-%dT%H:%M:%S.%f")[:24]
620 623
        if 'end_date' in d:
621 624
            d['end_date'] = d['end_date'].strftime("%Y-%m-%dT%H:%M:%S.%f")[:24]
625
	if 'entity' in d:
626
            d['entity'] = d['entity'].email 
622 627
        return d
623 628

  
624 629
class AstakosGroupSortForm(forms.Form):
b/snf-astakos-app/astakos/im/views.py
752 752
            d['own'].append(g)
753 753
        else:
754 754
            d['other'].append(g)
755
    d.set_default('own', []) 
756
    d.set_default('other', []) 
755
    d.setdefault('own', [])
756
    d.setdefault('other', [])
757 757
    for k, l in d.iteritems():
758 758
        page = request.GET.get('%s_page' % k, 1)
759 759
        sorting = globals()['%s_sorting' % k] = request.GET.get('%s_sorting' % k)
......
1100 1100
@signed_terms_required
1101 1101
@login_required
1102 1102
def timeline(request):
1103
    data = {'entity':request.user.email}
1103
#    data = {'entity':request.user.email}
1104 1104
    timeline_body = ()
1105 1105
    timeline_header = ()
1106
    form = TimelineForm(data)
1106
#    form = TimelineForm(data)
1107
    form = TimelineForm()
1107 1108
    if request.method == 'POST':
1108 1109
        data = request.POST
1109 1110
        form = TimelineForm(data)
......
1122 1123
                           form=form,
1123 1124
                           timeline_header=timeline_header,
1124 1125
                           timeline_body=timeline_body)
1125
                           l=l)

Also available in: Unified diff