Merge pull request #1304 from bcgov/dev

Dev

Author: jimmyPasta

applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js

@@ -120,6 +120,17 @@ $(function () {
 
     $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
     let actionButtons = [
+        {
+            text: '<i class="fl fl-add-to align-middle"></i> <span>' + l('NewRole') + '</span>',
+            titleAttr: l('NewRole'),
+            id: 'CreateRoleButton',
+            className: 'btn-light rounded-1',
+            available: () => abp.auth.isGranted('AbpIdentity.Roles.Create'),
+            action: (e, dt, node, config) => {
+                e.preventDefault();
+                _createModal.open();
+            }
+        },
         ...commonTableActionButtons(l('Roles'))
     ];
 

applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs

@@ -256,9 +256,9 @@ private async Task UpdateApplicationFormVersionFields(ApplicationFormVersion app
             }
 
             if (applicationFormVersion.Id == Guid.Empty)
-                await _formVersionRepository.InsertAsync(applicationFormVersion);
+                await _formVersionRepository.InsertAsync(applicationFormVersion, true);
             else
-                await _formVersionRepository.UpdateAsync(applicationFormVersion);
+                await _formVersionRepository.UpdateAsync(applicationFormVersion, true);
         }
 
         public async Task<ApplicationFormVersionDto?> GetByChefsFormVersionId(Guid chefsFormVersionId)

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs

@@ -141,6 +141,7 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     GrantApplicationPermissions.Comments.Add,
                     GrantManagerPermissions.Organizations.Default,
                     GrantManagerPermissions.Organizations.ManageProfiles,
+                    GrantApplicationPermissions.Approvals.BulkApplicationApproval,
 
                     .. ReviewAndAssessment_CommonPermissions,
                     .. ApplicantInfo_CommonPermissions,