99 new_params['sidebar_additional'] = [] |
99 new_params['sidebar_additional'] = [] |
100 |
100 |
101 new_params['key_fields_prefix'] = [] |
101 new_params['key_fields_prefix'] = [] |
102 new_params['link_id_arg_pattern'] = linkable.LINK_ID_ARG_PATTERN |
102 new_params['link_id_arg_pattern'] = linkable.LINK_ID_ARG_PATTERN |
103 new_params['link_id_pattern_core'] = linkable.LINK_ID_PATTERN_CORE |
103 new_params['link_id_pattern_core'] = linkable.LINK_ID_PATTERN_CORE |
|
104 new_params['scope_path_pattern'] = getScopePattern(params) |
104 |
105 |
105 new_params['django_patterns'] = None |
106 new_params['django_patterns'] = None |
106 new_params['extra_django_patterns'] = [] |
107 new_params['extra_django_patterns'] = [] |
107 new_params['django_patterns_defaults'] = [ |
108 new_params['django_patterns_defaults'] = [ |
108 (r'^%(url_name)s/show/%(key_fields)s$', |
109 (r'^%(url_name)s/show/%(key_fields)s$', |
109 'soc.views.models.%(module_name)s.public', 'Show %(name_short)s'), |
110 'soc.views.models.%(module_name)s.public', 'Show %(name_short)s'), |
110 (r'^%(url_name)s/create$', |
111 (r'^%(url_name)s/create$', |
111 'soc.views.models.%(module_name)s.create', 'Create %(name_short)s'), |
112 'soc.views.models.%(module_name)s.create', 'Create %(name_short)s'), |
112 (r'^%(url_name)s/create/%(key_fields)s$', |
113 (r'^%(url_name)s/create/%(key_fields)s$', |
113 'soc.views.models.%(module_name)s.create', 'Create %(name_short)s'), |
114 'soc.views.models.%(module_name)s.create', 'Create %(name_short)s'), |
|
115 (r'^%(url_name)s/create/%(scope)s$', |
|
116 'soc.views.models.%(module_name)s.create', 'Create %(name_short)s'), |
114 (r'^%(url_name)s/delete/%(key_fields)s$', |
117 (r'^%(url_name)s/delete/%(key_fields)s$', |
115 'soc.views.models.%(module_name)s.delete', 'Delete %(name_short)s'), |
118 'soc.views.models.%(module_name)s.delete', 'Delete %(name_short)s'), |
116 (r'^%(url_name)s/edit/%(key_fields)s$', |
119 (r'^%(url_name)s/edit/%(key_fields)s$', |
117 'soc.views.models.%(module_name)s.edit', 'Edit %(name_short)s'), |
120 'soc.views.models.%(module_name)s.edit', 'Edit %(name_short)s'), |
118 (r'^%(url_name)s/list$', |
121 (r'^%(url_name)s/list$', |
244 names = params['logic'].getKeyFieldNames() |
247 names = params['logic'].getKeyFieldNames() |
245 patterns = params['key_fields_prefix'] |
248 patterns = params['key_fields_prefix'] |
246 |
249 |
247 for name in names: |
250 for name in names: |
248 if name == 'scope_path': |
251 if name == 'scope_path': |
249 pattern = getScopePattern(params) |
252 pattern = params['scope_path_pattern'] |
250 else: |
253 else: |
251 pattern = r'(?P<%s>%s)' % (name, linkable.LINK_ID_PATTERN_CORE) |
254 pattern = r'(?P<%s>%s)' % (name, linkable.LINK_ID_PATTERN_CORE) |
252 patterns.append(pattern) |
255 patterns.append(pattern) |
253 |
256 |
254 result = '/'.join(patterns) |
257 result = '/'.join(patterns) |