Changeset 971

Show
Ignore:
Timestamp:
11/07/08 11:37:40 (2 months ago)
Author:
lucy
Message:

remove extra form from portfolio formset. order forms by interest label. remove intro background that was behaving strangely (blotting out words)

Location:
huginmunin/trunk/web/hm/app
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • huginmunin/trunk/web/hm/app/media/css/general.css

    r969 r971  
    294294        padding: 1em 2em 1em 2em; 
    295295        text-align:justify; 
    296         background: #f7fbef; 
     296        /* background: #f7fbef; this is making blotches apear over text for some reason -lucy */ 
    297297        display: inline; 
    298298} 

  • huginmunin/trunk/web/hm/app/views/forms.py

    r934 r971  
    8484        #fields = ('percent',) 
    8585 
    86 PortfolioFormSet = modelformset_factory(UserInterestPercent, form=PortfolioForm, fields=('percent',)) 
     86PortfolioFormSet = modelformset_factory(UserInterestPercent, form=PortfolioForm, fields=('percent',), extra=0) 
    8787 
    8888 

  • huginmunin/trunk/web/hm/app/views/main.py

    r969 r971  
    553553    user = current_user() 
    554554    datauser = User.get(int(user_id)) 
     555    portfolios = datauser.profile.get_interests().order_by('interest__label') 
    555556    if request.POST: 
    556         formset = PortfolioFormSet(request.POST, queryset=datauser.profile.get_interests()) 
     557        formset = PortfolioFormSet(request.POST, queryset=portfolios) 
    557558        if formset.is_valid(): 
     559            print " FORMS: " 
     560            print formset 
     561            print "<end forms>" 
    558562            formset.save() 
     563            print "<end save>" 
    559564            return HttpResponseRedirect(reverse('portfolio', args=(user_id,))) 
    560565    else: 
    561         formset = PortfolioFormSet(queryset=datauser.profile.get_interests()) 
     566        formset = PortfolioFormSet(queryset=portfolios) 
    562567    # form has not been submitted or has errors 
    563568    management_form = formset.management_form 
    … …  
    569574    user = current_user() 
    570575    datauser = User.get(int(user_id)) 
    571     interests = datauser.profile.get_interests() 
     576    interests = datauser.profile.get_interests().order_by('interest__label') 
    572577    mirror = user.id == datauser.id 
    573578    show_portfolio = mirror or datauser.profile.portfolio_isPublic