equal
deleted
inserted
replaced
34 import soc.views.helper.responses |
34 import soc.views.helper.responses |
35 import soc.views.out_of_band |
35 import soc.views.out_of_band |
36 |
36 |
37 from soc.logic import dicts |
37 from soc.logic import dicts |
38 from soc.logic import models |
38 from soc.logic import models |
39 from soc.logic import path_link_name |
39 from soc.models import linkable |
40 from soc.views import simple |
40 from soc.views import simple |
41 from soc.views import helper |
41 from soc.views import helper |
42 from soc.views.helper import access |
42 from soc.views.helper import access |
43 |
43 |
44 |
44 |
530 |
530 |
531 names = self._logic.getKeyFieldNames() |
531 names = self._logic.getKeyFieldNames() |
532 patterns = params['key_fields_prefix'] |
532 patterns = params['key_fields_prefix'] |
533 |
533 |
534 for name in names: |
534 for name in names: |
535 pattern = r'(?P<%s>%s)' % (name, path_link_name.LINK_ID_PATTERN_CORE) |
535 pattern = r'(?P<%s>%s)' % (name, linkable.LINK_ID_PATTERN_CORE) |
536 patterns.append(pattern) |
536 patterns.append(pattern) |
537 |
537 |
538 result = '/'.join(patterns) |
538 result = '/'.join(patterns) |
539 return result |
539 return result |
540 |
540 |
618 |
618 |
619 module = module % params['module_name'] |
619 module = module % params['module_name'] |
620 |
620 |
621 url = url % { |
621 url = url % { |
622 'url_name': params['url_name'], |
622 'url_name': params['url_name'], |
623 'lnp': path_link_name.LINK_ID_ARG_PATTERN, |
623 'lnp': linkable.LINK_ID_ARG_PATTERN, |
624 'ulnp': path_link_name.LINK_ID_PATTERN_CORE, |
624 'ulnp': linkable.LINK_ID_PATTERN_CORE, |
625 'key_fields': key_fields_pattern, |
625 'key_fields': key_fields_pattern, |
626 } |
626 } |
627 |
627 |
628 kwargs = {'page_name': name} |
628 kwargs = {'page_name': name} |
629 |
629 |