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

closes #2474 #2480

Closed
wants to merge 1 commit into from
Closed

closes #2474 #2480

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 16 additions & 17 deletions src/skin/js/GroupView.js
View file
Open in desktop
Expand Up @@ -77,14 +77,14 @@ $(document).ready(function () {
dataType: "json"
}).done(function (data) {
var person = data.Person2group2roleP2g2rs[0];
var node = dataT.row.add(person).node();
dataT.rows().invalidate().draw(true);
var node = window.CRM.DataTableAPI.row.add(person).node();
window.CRM.DataTableAPI.rows().invalidate().draw(true);
$(".personSearch").val(null).trigger('change')
});
});

$("#deleteSelectedRows").click(function () {
var deletedRows = dataT.rows('.selected').data()
var deletedRows = window.CRM.DataTableAPI.rows('.selected').data()
bootbox.confirm({
message: "Are you sure you want to remove the " + deletedRows.length + " selected group members?",
buttons: {
Expand All @@ -109,12 +109,12 @@ $(document).ready(function () {
data: {"_METHOD": "DELETE"},
encode: true
}).done(function (data) {
dataT.row(function (idx, data, node) {
window.CRM.DataTableAPI.row(function (idx, data, node) {
if (data.PersonId == value.PersonId) {
return true;
}
}).remove();
dataT.rows().invalidate().draw(true);
window.CRM.DataTableAPI.rows().invalidate().draw(true);
});
});
}
Expand All @@ -124,10 +124,10 @@ $(document).ready(function () {
});

$("#addSelectedToCart").click(function () {
if (dataT.rows('.selected').length > 0)
if (window.CRM.DataTableAPI.rows('.selected').length > 0)
{
var selectedPersons = {
"Persons" : $.map(dataT.rows('.selected').data(), function(val,i){
"Persons" : $.map(window.CRM.DataTableAPI.rows('.selected').data(), function(val,i){
return val.PersonId;
})
};
Expand Down Expand Up @@ -162,7 +162,7 @@ $(document).ready(function () {


$("#confirmTargetGroup").click(function () {
var selectedRows = dataT.rows('.selected').data()
var selectedRows = window.CRM.DataTableAPI.rows('.selected').data()
var targetGroupId = $("#targetGroupSelection option:selected").val()
var action = $("#targetGroupAction").val();

Expand All @@ -181,12 +181,12 @@ $(document).ready(function () {
encode: true,
data: {"_METHOD": "DELETE"},
}).done(function (data) {
dataT.row(function (idx, data, node) {
window.CRM.DataTableAPI.row(function (idx, data, node) {
if (data.PersonId == value.PersonId) {
return true;
}
}).remove();
dataT.rows().invalidate().draw(true);
window.CRM.DataTableAPI.rows().invalidate().draw(true);
});
}
});
Expand All @@ -198,12 +198,12 @@ $(document).ready(function () {

$(document).on("click", ".changeMembership", function (e) {
var userid = $(e.currentTarget).data("personid");
$("#changingMemberID").val(dataT.row(function (idx, data, node) {
$("#changingMemberID").val(window.CRM.DataTableAPI.row(function (idx, data, node) {
if (data.PersonId == userid) {
return true;
}
}).data().PersonId);
$("#changingMemberName").text(dataT.row(function (idx, data, node) {
$("#changingMemberName").text(window.CRM.DataTableAPI.row(function (idx, data, node) {
if (data.PersonId == userid) {
return true;
}
Expand All @@ -221,21 +221,21 @@ $(document).ready(function () {
dataType: "json",
contentType: "application/json; charset=utf-8",
}).done(function (data) {
dataT.row(function (idx, data, node) {
window.CRM.DataTableAPI.row(function (idx, data, node) {
if (data.PersonId == changingMemberID) {
data.RoleId = $("#newRoleSelection option:selected").val();
return true;
}
}).data();
dataT.rows().invalidate().draw(true);
window.CRM.DataTableAPI.rows().invalidate().draw(true);
$('#changeMembership').modal('hide');
});
});

});

function initDataTable() {
dataT = $("#membersTable").dataTable({
window.CRM.DataTableAPI = $("#membersTable").DataTable({
"language": {
"url": window.CRM.root + "/skin/locale/dataTables/" + window.CRM.locale + ".json"
},
Expand Down Expand Up @@ -335,8 +335,7 @@ function initDataTable() {
});

$(document).on('click', '.groupRow', function () {
$(this).toggleClass('selected');
var selectedRows = dataT.rows('.selected').data().length;
var selectedRows = window.CRM.DataTableAPI.rows('.selected').data().length;
$("#deleteSelectedRows").prop('disabled', !(selectedRows));
$("#deleteSelectedRows").text("Remove (" + selectedRows + ") Members from group");
$("#buttonDropdown").prop('disabled', !(selectedRows));
Expand Down