Skip to content
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

Jump to bottom

Display Assign Files: Prevent reassigning same items #2720

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Display Assign Files: Prevent reassigning same items #2720

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
47 changes: 36 additions & 11 deletions ui/src/core/xibo-forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,8 +952,15 @@ function membersFormSubmit(id) {
function mediaDisplayGroupFormCallBack() {

var container = $("#FileAssociationsAssign");
if (container.data().media == undefined)
if (container.data().media == undefined) {
container.data().media = {};
}

// Get starting items
var includedItems = [];
$('#FileAssociationsSortable').find('[data-media-id]').each((_i, el) => {
includedItems.push($(el).data('mediaId'));
});

var mediaTable = $("#mediaAssignments").DataTable({ "language": dataTablesLanguage,
serverSide: true, stateSave: true,
Expand All @@ -975,8 +982,15 @@ function mediaDisplayGroupFormCallBack() {
if (type != "display")
return "";

// Create a click-able span
return "<a href=\"#\" class=\"assignItem\"><span class=\"fa fa-plus\"></a>";
// If media id is already added to the container
// Create span with disabled
if(includedItems.indexOf(data.mediaId) != -1) {
// Create a disabled span
return "<a href=\"#\" class=\"assignItem disabled\"><span class=\"fa fa-plus hidden\"></a>";
} else {
// Create a click-able span
return "<a href=\"#\" class=\"assignItem\"><span class=\"fa fa-plus\"></a>";
}
}
}
]
Expand All @@ -986,13 +1000,21 @@ function mediaDisplayGroupFormCallBack() {
dataTableDraw(e, settings);

// Clicky on the +spans
$(".assignItem", "#mediaAssignments").click(function() {
$(".assignItem:not(.disabled)", "#mediaAssignments").on("click", function() {
// Get the row that this is in.
var data = mediaTable.row($(this).closest("tr")).data();

// Append to our media list
container.data().media[data.mediaId] = 1;

// Add to aux array
includedItems.push(data.mediaId);

// Disable add button
$(this).parents("tr").addClass('disabled');
// Hide plus button
$(this).hide();

// Construct a new list item for the lower list and append it.
var newItem = $("<li/>", {
"text": data.name,
Expand All @@ -1004,11 +1026,7 @@ function mediaDisplayGroupFormCallBack() {

// Add a span to that new item
$("<span/>", {
"class": "fa fa-minus",
click: function(){
container.data().media[$(this).parent().data().mediaId] = 0;
$(this).parent().remove();
}
"class": "fa fa-minus ml-1",
}).appendTo(newItem);
});
});
Expand All @@ -1018,9 +1036,16 @@ function mediaDisplayGroupFormCallBack() {
$("#FileAssociationsSortable").sortable();

// Bind to the existing items in the list
$("#FileAssociationsSortable").find('li span').click(function () {
container.data().media[$(this).parent().data().mediaId] = 0;
$("#FileAssociationsSortable").on("click", "li span", function () {
var mediaId = $(this).parent().data().mediaId;
container.data().media[mediaId] = 0;
$(this).parent().remove();

// Remove from aux array
includedItems = includedItems.filter(item => item != mediaId);

// Reload table
mediaTable.ajax.reload();
});

// Bind to the filter
Expand Down