renamed DirectiveLink.service_name to name and implemented checking SessnioalLink.action whether callable or not
| @@ -52,13 +52,13 @@ | ||
| 52 | 52 | |
| 53 | 53 | def __init__(self, tag, attrs, marker=None): |
| 54 | 54 | Link.__init__(self, tag, attrs, marker) |
| 55 | - self.service_name = None | |
| 55 | + self.name = None | |
| 56 | 56 | self.action = None |
| 57 | 57 | |
| 58 | 58 | def attrs_to_render(self, context): |
| 59 | 59 | attrs = Link.attrs_to_render(self, context) |
| 60 | 60 | if self.action: |
| 61 | - url = context.direct_action_url(self.service_name, | |
| 61 | + url = context.direct_action_url(self.name, | |
| 62 | 62 | self.action) |
| 63 | 63 | attrs[consts.HREF] = url |
| 64 | 64 | return attrs |
| @@ -72,7 +72,7 @@ | ||
| 72 | 72 | |
| 73 | 73 | def attrs_to_render(self, context): |
| 74 | 74 | attrs = Link.attrs_to_render(self, context) |
| 75 | - if self.action: | |
| 75 | + if callable(self.action): | |
| 76 | 76 | context.register_service_continuation(self.action) |
| 77 | 77 | attrs[consts.HREF] = context.continuation_action_url() |
| 78 | 78 | return attrs |
CarverWeb/trunk/carver/web/template/elements/links.py