0003-visualization-add-warehouse-slug-support-38596.patch
bijoe/schemas.py | ||
---|---|---|
395 | 395 | |
396 | 396 | |
397 | 397 |
class Warehouse(Base): |
398 |
__slots__ = ['name', 'label', 'pg_dsn', 'search_path', 'cubes', 'path'] |
|
398 |
__slots__ = ['name', 'slug', 'label', 'pg_dsn', 'search_path', 'cubes', 'path']
|
|
399 | 399 |
__types__ = { |
400 | 400 |
'name': str, |
401 |
'slug': str, |
|
401 | 402 |
'label': unicode, |
402 | 403 |
'pg_dsn': str, |
403 | 404 |
'search_path': [str], |
... | ... | |
406 | 407 |
} |
407 | 408 | |
408 | 409 |
path = None |
410 |
slug = None |
|
409 | 411 | |
410 | 412 |
def check(self): |
411 | 413 |
names = collections.Counter(cube.name for cube in self.cubes) |
bijoe/visualization/utils.py | ||
---|---|---|
80 | 80 |
if not warehouses: |
81 | 81 |
warehouses = get_warehouses() |
82 | 82 |
for warehouse in warehouses: |
83 |
if d['warehouse'] == warehouse.name: |
|
83 |
if warehouse.slug and 'warehouse_slug' in d: |
|
84 |
if d['warehouse_slug'] == warehouse.slug: |
|
85 |
break |
|
86 |
elif d['warehouse'] == warehouse.name: # legacy |
|
84 | 87 |
break |
85 | 88 |
else: |
86 | 89 |
raise Http404('warehouse %s not found' % d['warehouse']) |
87 |
- |