|
a/Allura/allura/lib/helpers.py |
|
b/Allura/allura/lib/helpers.py |
|
... |
|
... |
| 172 |
from allura import model
|
172 |
from allura import model
|
| 173 |
try:
|
173 |
try:
|
| 174 |
p = model.Project.query.get(_id=ObjectId(str(project_shortname_or_id)))
|
174 |
p = model.Project.query.get(_id=ObjectId(str(project_shortname_or_id)))
|
| 175 |
except InvalidId:
|
175 |
except InvalidId:
|
| 176 |
p = None
|
176 |
p = None
|
| 177 |
if p is None:
|
177 |
if p is None and type(project_shortname_or_id) != ObjectId:
|
| 178 |
if neighborhood is None:
|
178 |
if neighborhood is None:
|
| 179 |
raise TypeError('neighborhood is required; it must not be None')
|
179 |
raise TypeError('neighborhood is required; it must not be None')
|
| 180 |
if not isinstance(neighborhood, model.Neighborhood):
|
180 |
if not isinstance(neighborhood, model.Neighborhood):
|
| 181 |
n = model.Neighborhood.query.get(name=neighborhood)
|
181 |
n = model.Neighborhood.query.get(name=neighborhood)
|
| 182 |
if n is None:
|
182 |
if n is None:
|