equal
deleted
inserted
replaced
391 else: |
391 else: |
392 method = None |
392 method = None |
393 # in linksearch mode, we don't want external urls else selecting |
393 # in linksearch mode, we don't want external urls else selecting |
394 # the object for use in the relation is tricky |
394 # the object for use in the relation is tricky |
395 # XXX search_state is web specific |
395 # XXX search_state is web specific |
396 if 'base-url' not in kwargs and \ |
396 use_ext_id = False |
|
397 if 'base_url' not in kwargs and \ |
397 getattr(self._cw, 'search_state', ('normal',))[0] == 'normal': |
398 getattr(self._cw, 'search_state', ('normal',))[0] == 'normal': |
398 kwargs['base_url'] = self.cw_metainformation()['source'].get('base-url') |
399 baseurl = self.cw_metainformation()['source'].get('base-url') |
399 use_ext_id = bool(kwargs['base_url']) |
400 if baseurl: |
400 else: |
401 kwargs['base_url'] = baseurl |
401 use_ext_id = False |
402 use_ext_id = True |
402 if method in (None, 'view'): |
403 if method in (None, 'view'): |
403 try: |
404 try: |
404 kwargs['_restpath'] = self.rest_path(use_ext_id) |
405 kwargs['_restpath'] = self.rest_path(use_ext_id) |
405 except TypeError: |
406 except TypeError: |
406 warn('[3.4] %s: rest_path() now take use_ext_eid argument, ' |
407 warn('[3.4] %s: rest_path() now take use_ext_eid argument, ' |