altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Allow to filter the to field when a Liaison Manager changes de from field. Fixes #577

Browse source 
- Legacy-Id: 2790
This commit is contained in:
Emilio A. Sánchez López 2011-02-02 14:46:01 +00:00
parent d77970d860
commit fb7b3d2152
5 changed files with 76 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ietf/liaisons/forms.py
View file

@ -247,9 +247,9 @@ class IncomingLiaisonForm(LiaisonForm):
def get_post_only(self):
from_entity = self.get_from_entity()
if self.person.liaisonmanagers_set.filter(sdo=from_entity.obj):
return True
return False
if is_secretariat(self.user) or self.person.sdoauthorizedindividual_set.filter(sdo=from_entity.obj):
return False
return True
def clean(self):
if 'send' in self.data.keys() and self.get_post_only():
@ -271,15 +271,24 @@ class OutgoingLiaisonForm(LiaisonForm):
return organization
def set_from_field(self):
if is_secretariat(self.user) or is_sdo_liaison_manager(self.person):
if is_secretariat(self.user):
self.fields['from_field'].choices = self.hm.get_all_incoming_entities()
elif is_sdo_liaison_manager(self.person):
self.fields['from_field'].choices = self.hm.get_all_incoming_entities()
all_entities = []
for i in self.hm.get_entities_for_person(self.person):
all_entities += i[1]
if all_entities:
self.fields['from_field'].widget.full_power_on = [i[0] for i in all_entities]
self.fields['from_field'].widget.reduced_to_set = ['sdo_%s' % i.sdo.pk for i in self.person.liaisonmanagers_set.all().distinct()]
else:
self.fields['from_field'].choices = self.hm.get_entities_for_person(self.person)
self.fields['from_field'].widget.submitter = unicode(self.person)
self.fieldsets[0] = ('From', ('from_field', 'replyto', 'approved'))
def set_organization_field(self):
if is_sdo_liaison_manager(self.person):
# If the user is a liaison manager and is nothing more, reduce the To field to his SDOs
if not self.hm.get_entities_for_person(self.person) and is_sdo_liaison_manager(self.person):
sdos = [i.sdo for i in self.person.liaisonmanagers_set.all().distinct()]
self.fields['organization'].choices = [('sdo_%s' % i.pk, i.sdo_name) for i in sdos]
else:
@ -322,6 +331,24 @@ class OutgoingLiaisonForm(LiaisonForm):
self.check_email(value)
return value
def clean_organization(self):
to_code = self.cleaned_data.get('organization', None)
from_code = self.cleaned_data.get('from_field', None)
if not to_code or not from_code:
return to_code
all_entities = []
for i in self.hm.get_entities_for_person(self.person):
all_entities += i[1]
# If the from entity is one in wich the user has full privileges the to entity could be anyone
if from_code in [i[0] for i in all_entities]:
return to_code
sdo_codes = ['sdo_%s' % i.sdo.pk for i in self.person.liaisonmanagers_set.all().distinct()]
if to_code in sdo_codes:
return to_code
entity = self.get_to_entity()
entity_name = entity and entity.name or to_code
raise forms.ValidationError('You are not allowed to send a liaison to: %s' % entity_name)
class EditLiaisonForm(LiaisonForm):

9
ietf/liaisons/utils.py
View file

@ -1,7 +1,8 @@
from ietf.idtracker.models import Area, IETFWG
from ietf.liaisons.models import SDOs, LiaisonManagers
from ietf.liaisons.accounts import (is_ietfchair, is_iabchair, is_iab_executive_director,
get_ietf_chair, get_iab_chair, get_iab_executive_director)
get_ietf_chair, get_iab_chair, get_iab_executive_director,
is_secretariat)
IETFCHAIR = {'name': u'The IETF Chair', 'address': u'chair@ietf.org'}
IESG = {'name': u'The IESG', 'address': u'iesg@ietf.org'}
@ -194,8 +195,10 @@ class SDOEntity(Entity):
return [manager.person]
return []
def post_only(self, person):
return bool(self.obj.liaisonmanagers_set.filter(person=person))
def post_only(self, person, user):
if is_secretariat(user) or person.sdoauthorizedindividual_set.filter(sdo=self.obj):
return False
return True
def full_user_list(self):
result = [i.person for i in self.obj.liaisonmanagers_set.all().distinct()]

2
ietf/liaisons/views.py
View file

@ -75,7 +75,7 @@ def get_info(request):
[i.email() for i in from_entity.get_from_cc(person=person)],
'poc': [i.email() for i in to_entity.get_poc()],
'needs_approval': from_entity.needs_approval(person=person),
'post_only': from_entity.post_only(person=person)})
'post_only': from_entity.post_only(person=person, user=request.user)})
if is_secretariat(request.user):
full_list = [(i.pk, i.email()) for i in from_entity.full_user_list()]
full_list.sort(lambda x,y: cmp(x[1], y[1]))

12
ietf/liaisons/widgets.py
View file

@ -7,6 +7,11 @@ from django.utils.safestring import mark_safe
class FromWidget(Select):
def __init__(self, *args, **kwargs):
super(FromWidget, self).__init__(*args, **kwargs)
self.full_power_on = []
self.reduced_to_set = []
def render(self, name, value, attrs=None, choices=()):
all_choices = list(self.choices) + list(choices)
if len(all_choices)!=1 or \
@ -21,6 +26,13 @@ class FromWidget(Select):
text = option[1]
base = u'<input type="hidden" value="%s" id="id_%s" name="%s" />%s' % (value, name, name, text)
base += u' (<a class="from_mailto" href="">' + self.submitter + u'</a>)'
if self.full_power_on:
base += '<div style="display: none;" class="reducedToOptions">'
for from_code in self.full_power_on:
base += '<span class="full_power_on_%s"></span>' % from_code
for to_code in self.reduced_to_set:
base += '<span class="reduced_to_set_%s"></span>' % to_code
base += '</div>'
return mark_safe(base)

27
static/js/liaisons.js
View file

@ -317,10 +317,33 @@
return false;
};
var checkFrom = function() {
var reduce_options = form.find('.reducedToOptions');
var to_select = organization;
var from_entity = from.val();
if (!reduce_options.find('.full_power_on_' + from_entity).length) {
to_select.find('optgroup').eq(1).hide();
to_select.find('option').each(function() {
if (!reduce_options.find('.reduced_to_set_' + $(this).val()).length) {
$(this).hide();
} else {
$(this).show();
}
});
if (!to_select.find('option:selected').is(':visible')) {
to_select.find('option:selected').removeAttr('selected');
}
} else {
to_select.find('optgroup').show();
to_select.find('option').show();
}
updateInfo();
};
var initTriggers = function() {
organization.change(updateInfo);
organization.change(checkOtherSDO);
from.change(updateInfo);
from.change(checkFrom);
reply.keyup(updateFrom);
purpose.change(updatePurpose);
cancel.click(cancelForm);
@ -330,7 +353,7 @@
var updateOnInit = function() {
updateFrom();
updateInfo();
checkFrom();
updatePurpose();
checkOtherSDO();
};