Revision 373daf6a snf-astakos-app/astakos/im/forms.py

b/snf-astakos-app/astakos/im/forms.py
491 491

  
492 492
def get_astakos_group_creation_form(request):
493 493
    class AstakosGroupCreationForm(forms.ModelForm):
494
        issue_date = forms.DateField(widget=SelectDateWidget())
495
        expiration_date = forms.DateField(widget=SelectDateWidget())
494
        issue_date = forms.DateField(widget=SelectDateWidget(), initial=datetime.now())
495
        # TODO set initial in exact one month
496
        expiration_date = forms.DateField(widget=SelectDateWidget(), initial = datetime.now() + timedelta(days=30))
496 497
        kind = forms.ModelChoiceField(queryset=GroupKind.objects.all(), empty_label=None)
497 498
        name = forms.URLField()
498 499
        
......
510 511
            if commit: 
511 512
                g.save()
512 513
                g.owner = [request.user]
513
#                 g.approve_member(request.user)
514
                g.approve_member(request.user)
514 515
            return g
515 516
    
516 517
    return AstakosGroupCreationForm
517 518

  
518
def get_astakos_group_policy_creation_form(group):
519
def get_astakos_group_policy_creation_form(astakosgroup):
519 520
    class AstakosGroupPolicyCreationForm(forms.ModelForm):
520
        choices = Resource.objects.filter(~Q(astakosgroup=group))
521
        choices = Resource.objects.filter(~Q(astakosgroup=astakosgroup))
521 522
        resource = forms.ModelChoiceField(queryset=choices, empty_label=None)
523
        # TODO check that it does not hit the db
524
        group = forms.ModelChoiceField(queryset=AstakosGroup.objects.all(), initial=astakosgroup, widget=forms.HiddenInput())
522 525
        
523 526
        class Meta:
524 527
            model = AstakosGroupQuota
525
        
526
        def __init__(self, *args, **kwargs):
527
            if not args:
528
                args = ({'group':group},)
529
            super(AstakosGroupPolicyCreationForm, self).__init__(*args, **kwargs)
530
            self.fields['group'].widget.attrs['disabled'] = True
531 528
    
532 529
    return AstakosGroupPolicyCreationForm

Also available in: Unified diff