Skip to content

add team name to dataset list #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mike-kaimika wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −2
Open

add team name to dataset list #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ifcbdb/secure/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ def dataset_management(request):

form = DatasetForm(user=request.user)

is_teams_enabled = waffle.switch_is_active("Teams")

return render(request, 'secure/dataset-management.html', {
"form": form,
"is_teams_enabled": is_teams_enabled,
})


Expand Down Expand Up @@ -128,8 +131,20 @@ def dt_datasets(request):

datasets = datasets.filter(id__in=team_datasets_ids)

is_teams_enabled = waffle.switch_is_active("Teams")

if is_teams_enabled:
datasets = datasets.prefetch_related("teamdataset_set__team")

data = []
for dataset in datasets:
item = dataset.teamdataset_set.first() if is_teams_enabled else None
team_name = item.team.name if item else ""

data.append([dataset.name, dataset.title, dataset.is_active, team_name, dataset.id])

return JsonResponse({
"data": list(datasets.values_list("name", "title", "is_active", "id"))
"data": data
})

@waffle_switch('Teams')
Expand Down
4 changes: 3 additions & 1 deletion ifcbdb/templates/secure/dataset-management.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<th>Name</th>
<th>Title</th>
<th>Active?</th>
{% if is_teams_enabled %}<th>Team</th>{% endif %}
<th></th>
</tr>
</thead>
Expand Down Expand Up @@ -62,7 +63,7 @@ <h5 class="modal-title" id="datasetDeleteModalLabel">Confirm Deletion</h5>
<script>
$(function(){
$('#datasets').DataTable({
searching: false,
searching: true,
lengthChange: false,
ajax: {
url: "{% url 'secure:datasets_dt' %}"
Expand All @@ -76,6 +77,7 @@ <h5 class="modal-title" id="datasetDeleteModalLabel">Confirm Deletion</h5>
return data ? "Yes" : "No";
}
}, // Is Active
{% if is_teams_enabled %}{}, // Team{% endif %}
{ // Edit and datasets
targets: -1,
render: function ( data, type, row ) {
Expand Down