Merge pull request #2354 from SkillsFundingAgency/CON-62_Transfer-mig…

…ration-feature-toggle MAC-62 transfer migration feature toggle
SkillsFundingAgency · Aug 2, 2022 · 5af08b9 · 5af08b9
2 parents 06648d3 + e686e65
commit 5af08b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Controllers/TransferConnectionInvitationsController.cs b/src/SFA.DAS.EmployerAccounts.Web/Controllers/TransferConnectionInvitationsController.cs
@@ -22,7 +22,7 @@
 
 namespace SFA.DAS.EmployerAccounts.Web.Controllers
 {
-    [DasAuthorize("EmployerFeature.TransferConnectionRequests", EmployerUserRole.Any)]
+    [DasAuthorize("EmployerFeature.TransferConnectionRequestsPreMigration", EmployerUserRole.Any)]
     [RoutePrefix("accounts/{HashedAccountId}/transfers/connections/requests")]
     public class TransferConnectionInvitationsController : Controller
     {

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml
@@ -26,21 +26,19 @@
             <p>If you work with more than one organisation, you need to add them here; they will need their own agreement with the ESFA.</p>
         </div>
         <p class="govuk-body">You can add as many <a class="govuk-link" href="https://www.gov.uk/government/publications/employment-allowance-more-detailed-guidance" target="_blank">connected organisations</a> as you need to.</p>
-        <p class="govuk-body">Transfers status:&nbsp;
+        <p class="govuk-body">
+            Transfers status:&nbsp;
             <span>
                 @{
                     var authorizationResult = Html.GetAuthorizationResult("EmployerFeature.TransferConnectionRequests");
-                    if (authorizationResult.IsAuthorized)
+                    var authorizationResultTransferMigration = Html.GetAuthorizationResult("EmployerFeature.TransferConnectionRequestsPreMigration");
+                    if (authorizationResult.IsAuthorized && authorizationResultTransferMigration.IsAuthorized)
                     {
                         @:enabled.
                     }
-                    else if (authorizationResult.HasError<EmployerFeatureAgreementNotSigned>())
-                    {
-                        @:disabled.
-                    }
                     else
                     {
-                        throw new ArgumentOutOfRangeException();
+                        @:disabled.
                     }
                 }
             </span>
@@ -62,10 +60,11 @@
                 </tr>
             </thead>
             <tbody class="govuk-table__body">
-            @foreach (var employerAgreement in Model.Data.EmployerAgreementsData.EmployerAgreements)
-            {
-                <tr class="govuk-table__row">
-                    <td class="govuk-table__cell">@employerAgreement.LegalEntity.Name
+                @foreach (var employerAgreement in Model.Data.EmployerAgreementsData.EmployerAgreements)
+                {
+                    <tr class="govuk-table__row">
+                        <td class="govuk-table__cell">
+                            @employerAgreement.LegalEntity.Name
                         <span class="govuk-caption-m">Agreement ID: @employerAgreement.LegalEntity.AccountLegalEntityPublicHashedId</span>
                     </td>
                     <td class="govuk-table__cell">