|
a/Allura/allura/lib/app_globals.py |
|
b/Allura/allura/lib/app_globals.py |
|
... |
|
... |
| 343 |
if base.startswith(':'):
|
343 |
if base.startswith(':'):
|
| 344 |
base = request.scheme + base
|
344 |
base = request.scheme + base
|
| 345 |
return (base + app.config.tool_name.lower() + '/' + resource)
|
345 |
return (base + app.config.tool_name.lower() + '/' + resource)
|
| 346 |
|
346 |
|
| 347 |
def set_project(self, pid_or_project):
|
347 |
def set_project(self, pid_or_project):
|
|
|
348 |
'h.set_context() is preferred over this method'
|
| 348 |
if isinstance(pid_or_project, M.Project):
|
349 |
if isinstance(pid_or_project, M.Project):
|
| 349 |
c.project = pid_or_project
|
350 |
c.project = pid_or_project
|
| 350 |
elif isinstance(pid_or_project, basestring):
|
351 |
elif isinstance(pid_or_project, basestring):
|
| 351 |
c.project = M.Project.query.get(shortname=pid_or_project, deleted=False)
|
352 |
raise TypeError('need a Project instance, got %r' % pid_or_project)
|
| 352 |
elif pid_or_project is None:
|
353 |
elif pid_or_project is None:
|
| 353 |
c.project = None
|
354 |
c.project = None
|
| 354 |
else:
|
355 |
else:
|
| 355 |
c.project = None
|
356 |
c.project = None
|
| 356 |
log.error('Trying g.set_project(%r)', pid_or_project)
|
357 |
log.error('Trying g.set_project(%r)', pid_or_project)
|
| 357 |
|
358 |
|
| 358 |
def set_app(self, name):
|
359 |
def set_app(self, name):
|
|
|
360 |
'h.set_context() is preferred over this method'
|
| 359 |
c.app = c.project.app_instance(name)
|
361 |
c.app = c.project.app_instance(name)
|
| 360 |
|
362 |
|
| 361 |
def url(self, base, **kw):
|
363 |
def url(self, base, **kw):
|
| 362 |
params = urlencode(kw)
|
364 |
params = urlencode(kw)
|
| 363 |
if params:
|
365 |
if params:
|