...
 
Commits (5)
<div class="mat-row">
<div class="mat-cell">
<a mat-icon-button>
<mat-icon>reorder</mat-icon>
<mat-icon>drag_handle</mat-icon>
</a>
<button mat-icon-button (click)="deleteFilter.emit(filter.position)">
<mat-icon>delete</mat-icon>
......
......@@ -14,11 +14,13 @@
<div class="mat-header-cell"></div>
<div class="mat-header-cell">Exclude</div>
</div>
<tree-root [nodes]="this.getFilters()" [options]="treeOptions">
<tree-root [nodes]="filters" [options]="treeOptions">
<ng-template #treeNodeWrapperTemplate let-node let-index="index">
<app-filter-tab-row [filter]="node.data" (updateFilter)="updateFilter.emit($event)" (deleteFilter)="deleteFilter.emit($event)"
(click)="node.mouseAction('click', $event)" (treeDrop)="node.onDrop($event)" [treeAllowDrop]="node.allowDrop" [treeDrag]="node"
[treeDragEnabled]="node.allowDrag()"></app-filter-tab-row>
<div class="node-wrapper report-builder-display-grid">
<app-filter-tab-row [filter]="node.data" (updateFilter)="updateFilter.emit($event)" (deleteFilter)="deleteFilter.emit($event)"
(click)="node.mouseAction('click', $event)" (treeDrop)="node.onDrop($event)" [treeAllowDrop]="node.allowDrop" [treeDrag]="node"
[treeDragEnabled]="node.allowDrag()"></app-filter-tab-row>
</div>
</ng-template>
</tree-root>
</div>
......@@ -55,8 +55,4 @@ export class FilterTabComponent {
},
} as IActionMapping,
};
getFilters() {
return this.filters.map(x => ({ ...x }));
}
}
......@@ -7,7 +7,7 @@ from django.conf import settings
try:
from django.core.urlresolvers import reverse
except ModuleNotFoundError:
except ImportError:
from django.urls import reverse
......
......@@ -22,7 +22,7 @@ import re
try:
from django.core.urlresolvers import reverse
except ModuleNotFoundError:
except ImportError:
from django.urls import reverse
AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
......
......@@ -22,7 +22,7 @@ from django.contrib.auth import get_user_model
try:
from django.core.urlresolvers import reverse
except ModuleNotFoundError:
except ImportError:
from django.urls import reverse
User = get_user_model()
......
......@@ -3,7 +3,7 @@ from .models import ScheduledReport
try:
from django.core.urlresolvers import reverse
except ModuleNotFoundError:
except ImportError:
from django.urls import reverse
@admin.register(ScheduledReport)
......
......@@ -10,7 +10,7 @@ from unittest import skipIf
try:
from django.core.urlresolvers import reverse
except ModuleNotFoundError:
except ImportError:
from django.urls import reverse
User = get_user_model()
......
......@@ -7,7 +7,7 @@ from .models import ScheduledReport
try:
from django.core.urlresolvers import reverse
except ModuleNotFoundError:
except ImportError:
from django.urls import reverse
@staff_member_required
......
......@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="django-report-builder",
version="6.0.0",
version="6.0.1",
author="David Burke",
author_email="david@burkesoftware.com",
description=("Query and Report builder for Django ORM"),
......