diff -r 9c4221f7b747 -r 0afbdd0905ef app/soc/views/models/request.py --- a/app/soc/views/models/request.py Fri Jan 30 17:23:19 2009 +0000 +++ b/app/soc/views/models/request.py Fri Jan 30 17:38:28 2009 +0000 @@ -85,7 +85,7 @@ new_params['create_template'] = ['soc/request/create.html'] new_params['save_message'] = [ugettext('Request saved.')] - new_params['extra_dynaexclude'] = ['state', 'role_verbose'] + new_params['extra_dynaexclude'] = ['status', 'role_verbose'] new_params['create_extra_dynafields'] = { 'role': forms.CharField(widget=widgets.ReadOnlyInput(), @@ -150,7 +150,7 @@ fields = {'link_id': kwargs['link_id'], 'scope_path': kwargs['scope_path'], 'role': kwargs['role'], - 'state': 'group_accepted'} + 'status': 'group_accepted'} request_entity = request_logic.getForFields(fields, unique=True) # set the page name using the request_entity @@ -159,11 +159,11 @@ get_dict = request.GET - if 'state' in get_dict.keys(): - if get_dict['state'] == 'rejected': + if 'status' in get_dict.keys(): + if get_dict['status'] == 'rejected': # this invite has been rejected mark as rejected request_logic.updateEntityProperties(request_entity, { - 'state': 'rejected'}) + 'status': 'rejected'}) # redirect to user role overview return http.HttpResponseRedirect('/user/roles') @@ -201,7 +201,7 @@ # only select the Invites for this user that haven't been handled yet filter = {'link_id': user_entity.link_id, - 'state': 'group_accepted'} + 'status': 'group_accepted'} uh_params = params.copy() uh_params['list_action'] = (redirects.getInviteProcessRedirect, None) @@ -216,7 +216,7 @@ # only select the requests from the user # that haven't been accepted by an admin yet filter = {'link_id': user_entity.link_id, - 'state': 'new'} + 'status': 'new'} ar_params = params.copy() ar_params['list_description'] = ugettext(