--- a/app/soc/views/models/org_app.py Sat Mar 07 19:45:38 2009 +0000
+++ b/app/soc/views/models/org_app.py Sat Mar 07 19:46:18 2009 +0000
@@ -161,21 +161,24 @@
if 'scope_path' in form.initial:
scope_path = form.initial['scope_path']
elif 'scope_path' in request.POST:
- # TODO: do this nicely
scope_path = request.POST['scope_path']
else:
- # TODO: is this always sufficient?
del form.fields['admin_agreement']
return
entity = program_logic.logic.getFromKeyName(scope_path)
- if not entity or not entity.org_admin_agreement:
+ agreement = entity.org_admin_agreement
+
+ if not (entity and agreement):
return
- content = entity.org_admin_agreement.content
+ content = agreement.content
+ params = {'url_name': 'document'}
- form.fields['admin_agreement'].widget.text = content
+ widget = form.fields['admin_agreement'].widget
+ widget.text = content
+ widget.url = redirects.getPublicRedirect(agreement, params)
def _review(self, request, params, app_entity, status, **kwargs):
"""Sends out an email if an org_app has been accepted or rejected.