# HG changeset patch # User Daniel Hans # Date 1250510473 -7200 # Node ID 44bb0e89cc1b7ed137c71526e80c9317a1142089 # Parent 9dd7c21e330b4f02df2ed6b6dbc7049eaecaf016 Whitespace fix in Program view. diff -r 9dd7c21e330b -r 44bb0e89cc1b app/soc/views/models/program.py --- a/app/soc/views/models/program.py Mon Aug 17 13:52:50 2009 +0200 +++ b/app/soc/views/models/program.py Mon Aug 17 14:01:13 2009 +0200 @@ -90,7 +90,7 @@ rights = access.Checker(params) rights['any_access'] = ['allow'] rights['show'] = ['allow'] - rights['create'] = [('checkSeeded', ['checkHasActiveRoleForScope', + rights['create'] = [('checkSeeded', ['checkHasActiveRoleForScope', host_logic.logic])] rights['edit'] = ['checkIsHostForProgram'] rights['delete'] = ['checkIsDeveloper'] @@ -102,7 +102,7 @@ ['accepted_organization_announced_deadline', '__all__', program_logic.logic])] rights['list_projects'] = [('checkIsAfterEvent', - ['accepted_students_announced_deadline', + ['accepted_students_announced_deadline', '__all__', program_logic.logic])] new_params = {} @@ -272,7 +272,7 @@ from soc.views.models.organization import view as org_view ao_params = org_view.getParams().copy() # active orgs - ao_list = self._getAcceptedOrgsList(description, ao_params, + ao_list = self._getAcceptedOrgsList(description, ao_params, filter, use_cache) contents.append(ao_list) @@ -322,7 +322,7 @@ page_name: the page name displayed in templates as page and header title params: a dict with params for this View, not used """ - + from django.utils import simplejson program = program_logic.logic.getFromKeyFieldsOr404(kwargs) @@ -434,7 +434,7 @@ @decorators.check_access def showDuplicates(self, request, access_type, page_name=None, params=None, **kwargs): - """View in which a host can see which students have been assigned + """View in which a host can see which students have been assigned multiple slots. For params see base.view.Public(). @@ -529,7 +529,7 @@ 'slots >': 0, 'status': 'active'} - org_entities = org_logic.logic.getForFields(fields, + org_entities = org_logic.logic.getForFields(fields, limit=limit, offset=offset) orgs_data = {} @@ -743,7 +743,7 @@ (redirects.getApplyRedirect(program_entity, {'url_name': 'org_app'}), "Apply to become an Organization", 'any_access')] - if user and timeline_helper.isAfterEvent(timeline_entity, + if user and timeline_helper.isAfterEvent(timeline_entity, 'org_signup_start'): filter = { 'applicant': user, @@ -805,7 +805,7 @@ return items - def _getStudentEntries(self, program_entity, student_entity, + def _getStudentEntries(self, program_entity, student_entity, params, id, user): """Returns a list with menu items for students in a specific program. """ @@ -824,7 +824,7 @@ {'url_name':'student_proposal'}), "List my Student Proposals", 'any_access')] - items += [(redirects.getEditRedirect(student_entity, + items += [(redirects.getEditRedirect(student_entity, {'url_name': 'student'}), "Edit my Student Profile", 'any_access')]