diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
index 8f5ea60df..89e283adb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
@@ -237,8 +237,7 @@
data: 'referenceNo',
name: 'referenceNo',
className: 'data-table-header text-nowrap',
- render: function (data, type, row) {
- console.log(row);
+ render: function (data, type, row) {
return `
${data}`;
},
index: 2
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
index 7cd4272f3..2c17a050d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
@@ -31,6 +31,13 @@
class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
text="@L["ApplicationList:AssignButton"].Value" />
+ @if (true) { // Validate against required permission
+
+ }
{
selectedApplicationIds.push(data.id);
@@ -190,22 +177,6 @@ $(function () {
applicationIds: JSON.stringify(selectedApplicationIds),
});
});
- $('#approveApplications').click(function () {
- approveApplicationsModal.open({
- applicationIds: JSON.stringify(selectedApplicationIds),
- operation: 'GRANT_APPROVED',
- message: 'Are you sure you want to approve the selected application/s?',
- title: 'Approve Applications',
- });
- });
- $('#dontApproveApplications').click(function () {
- dontApproveApplicationsModal.open({
- applicationIds: JSON.stringify(selectedApplicationIds),
- operation: 'GRANT_NOT_APPROVED',
- message: 'Are you sure you want to disapprove the selected application/s?',
- title: 'Not Approve Applications',
- });
- });
$('#applicationLink').click(function () {
const summaryCanvas = document.getElementById('applicationAsssessmentSummary');
@@ -232,24 +203,24 @@ $(function () {
if (selectedApplicationIds.length == 0) {
$('*[data-selector="applications-table-actions"]').prop('disabled', true);
$('*[data-selector="applications-table-actions"]').addClass('action-bar-btn-unavailable');
- $('.action-bar').removeClass('active');
+ $('.action-bar').removeClass('active');
const summaryCanvas = document.getElementById('applicationAsssessmentSummary');
summaryCanvas.classList.remove('show');
- }
- else {
+ }
+ else {
$('*[data-selector="applications-table-actions"]').prop('disabled', false);
$('*[data-selector="applications-table-actions"]').removeClass('action-bar-btn-unavailable');
$('.action-bar').addClass('active');
$('#externalLink').addClass('action-bar-btn-unavailable');
$('#applicationLink').addClass('action-bar-btn-unavailable');
-
+
if (selectedApplicationIds.length == 1) {
$('#externalLink').removeClass('action-bar-btn-unavailable');
$('#applicationLink').removeClass('action-bar-btn-unavailable');
- summaryWidgetManager.refresh();
+ summaryWidgetManager.refresh();
}
}
}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.js
index 98452c688..b3427e040 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.js
@@ -27,7 +27,7 @@ $(function () {
);
});
- $('#approveApplicationsDetails').click(function () {
+ $('#approveApplications').click(function () {
approveApplicationsModal.open({
applicationIds: JSON.stringify(new Array(selectedApplicationIds)),
operation: 'GRANT_APPROVED',
@@ -35,14 +35,6 @@ $(function () {
title: 'Approve Applications',
});
});
- $('#disApproveApplicationsDetails').click(function () {
- dontApproveApplicationsModal.open({
- applicationIds: JSON.stringify(new Array(selectedApplicationIds)),
- operation: 'GRANT_NOT_APPROVED',
- message: 'Are you sure you want to disapprove this application?',
- title: 'Not Approve Applications',
- });
- });
let startAssessmentModal = new abp.ModalManager({
viewUrl: '../Approve/ApproveApplicationsModal'