equal
deleted
inserted
replaced
80 |
80 |
81 new_params['name'] = "Organization Admin" |
81 new_params['name'] = "Organization Admin" |
82 new_params['module_name'] = "org_admin" |
82 new_params['module_name'] = "org_admin" |
83 new_params['sidebar_grouping'] = 'Organizations' |
83 new_params['sidebar_grouping'] = 'Organizations' |
84 |
84 |
85 new_params['extra_dynaexclude'] = ['agreed_to_tos'] |
85 new_params['extra_dynaexclude'] = ['agreed_to_tos', 'program'] |
86 |
86 |
87 new_params['create_extra_dynafields'] = { |
87 new_params['create_extra_dynafields'] = { |
88 'scope_path': forms.fields.CharField(widget=forms.HiddenInput, |
88 'scope_path': forms.fields.CharField(widget=forms.HiddenInput, |
89 required=True), |
89 required=True), |
90 'admin_agreement': forms.fields.CharField(required=False, |
90 'admin_agreement': forms.fields.CharField(required=False, |
123 """ |
123 """ |
124 |
124 |
125 if not entity: |
125 if not entity: |
126 fields['user'] = fields['link_id'] |
126 fields['user'] = fields['link_id'] |
127 fields['link_id'] = fields['user'].link_id |
127 fields['link_id'] = fields['user'].link_id |
|
128 group_logic = params['group_logic'] |
|
129 group_entity = group_logic.getFromKeyName(fields['scope_path']) |
|
130 fields['program'] = group_entity.scope |
128 |
131 |
129 fields['agreed_to_tos'] = fields['agreed_to_admin_agreement'] |
132 fields['agreed_to_tos'] = fields['agreed_to_admin_agreement'] |
130 |
133 |
131 super(View, self)._editPost(request, entity, fields) |
134 super(View, self)._editPost(request, entity, fields) |
132 |
135 |
138 |
141 |
139 # fill in the appropriate fields that were missing in the form |
142 # fill in the appropriate fields that were missing in the form |
140 fields['user'] = fields['link_id'] |
143 fields['user'] = fields['link_id'] |
141 fields['link_id'] = fields['user'].link_id |
144 fields['link_id'] = fields['user'].link_id |
142 fields['agreed_to_tos'] = fields['agreed_to_admin_agreement'] |
145 fields['agreed_to_tos'] = fields['agreed_to_admin_agreement'] |
|
146 |
|
147 group_logic = params['group_logic'] |
|
148 group_entity = group_logic.getFromKeyName(fields['scope_path']) |
|
149 fields['program'] = group_entity.scope |
143 |
150 |
144 def _editGet(self, request, entity, form): |
151 def _editGet(self, request, entity, form): |
145 """Sets the content of the agreed_to_tos_on field and replaces. |
152 """Sets the content of the agreed_to_tos_on field and replaces. |
146 |
153 |
147 Also replaces the agreed_to_tos field with a hidden field when the ToS has been signed. |
154 Also replaces the agreed_to_tos field with a hidden field when the ToS has been signed. |