equal
deleted
inserted
replaced
517 |
517 |
518 names = self._logic.getKeyFieldNames() |
518 names = self._logic.getKeyFieldNames() |
519 patterns = params['key_fields_prefix'] |
519 patterns = params['key_fields_prefix'] |
520 |
520 |
521 for name in names: |
521 for name in names: |
522 pattern = r'(?P<%s>%s)' % (name, path_link_name.LINKNAME_PATTERN_CORE) |
522 pattern = r'(?P<%s>%s)' % (name, path_link_name.LINK_ID_PATTERN_CORE) |
523 patterns.append(pattern) |
523 patterns.append(pattern) |
524 |
524 |
525 result = '/'.join(patterns) |
525 result = '/'.join(patterns) |
526 return result |
526 return result |
527 |
527 |
605 |
605 |
606 module = module % params['module_name'] |
606 module = module % params['module_name'] |
607 |
607 |
608 url = url % { |
608 url = url % { |
609 'url_name': params['url_name'], |
609 'url_name': params['url_name'], |
610 'lnp': path_link_name.LINKNAME_ARG_PATTERN, |
610 'lnp': path_link_name.LINK_ID_ARG_PATTERN, |
611 'ulnp': path_link_name.LINKNAME_PATTERN_CORE, |
611 'ulnp': path_link_name.LINK_ID_PATTERN_CORE, |
612 'key_fields': key_fields_pattern, |
612 'key_fields': key_fields_pattern, |
613 } |
613 } |
614 |
614 |
615 kwargs = {'page_name': name} |
615 kwargs = {'page_name': name} |
616 |
616 |