equal
deleted
inserted
replaced
454 |
454 |
455 def base_url(self, secure=None): |
455 def base_url(self, secure=None): |
456 """return the root url of the instance |
456 """return the root url of the instance |
457 """ |
457 """ |
458 if secure: |
458 if secure: |
459 return self.vreg.config.get('https-url', self.vreg.config['base-url']) |
459 return self.vreg.config.get('https-url') or self.vreg.config['base-url'] |
460 return self.vreg.config['base-url'] |
460 return self.vreg.config['base-url'] |
461 |
461 |
462 # abstract methods to override according to the web front-end ############# |
462 # abstract methods to override according to the web front-end ############# |
463 |
463 |
464 def describe(self, eid, asdict=False): |
464 def describe(self, eid, asdict=False): |