Skip to content

P
PERFORMA_REPLICA
Commit 1a87c338 by Nilu
Options

S21287677 # Client - Incoming Issues (raised by Client) #Warning if no HT Logo 

modifications
parent 14677235
Showing with 10 additions and 17 deletions
cmsWebApp/src/performa/form/SaveCompanyFP.java
...@@ -32,12 +32,9 @@ public class SaveCompanyFP extends SaveFP ...@@ -32,12 +32,9 @@ public class SaveCompanyFP extends SaveFP
Boolean isPayment = (Boolean) request.getAttribute("IsPayment"); Boolean isPayment = (Boolean) request.getAttribute("IsPayment");
Subscription subscription = StripeUtils.retrieveSubscription(hiringTeam.getStripeSubscription()); Subscription subscription = StripeUtils.retrieveSubscription(hiringTeam.getStripeSubscription());
Boolean isHTLogoPresent = process.getAttribute("IsHTLogoPresent") != null ? (Boolean) process.getAttribute("IsHTLogoPresent") : Boolean.FALSE; Boolean isHTLogoPresent = process.getAttribute("IsHTLogoPresent") != null ? (Boolean) process.getAttribute("IsHTLogoPresent") : Boolean.FALSE;
// String nextPage = (String)request.getAttribute("nextPage");
Article article = WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.MY_COMPANY); Article article = WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.MY_COMPANY);
String hiringPage = LoopbackHTTP.getRemoteAccessURL(request)
+ article.getLink(request, CollectionUtils.mapEntry("cms.rm", "HiringTeam").toMap(), "/");
String nextPage = LoopbackHTTP.getRemoteAccessURL(request) String nextPage = LoopbackHTTP.getRemoteAccessURL(request)
+ article.getLink(request, CollectionUtils.mapEntry("cms.rm", "Page").toMap(), "/"); + article.getLink(request, CollectionUtils.mapEntry("cms.rm", hiringTeam.getHiringTeamLogo() != null ? "Page" : "HiringTeam").toMap(), "/");
if(CollectionUtils.equals(hiringTeam.getIsLogoDeleted(), Boolean.TRUE)) if(CollectionUtils.equals(hiringTeam.getIsLogoDeleted(), Boolean.TRUE))
{ {
...@@ -79,7 +76,7 @@ public class SaveCompanyFP extends SaveFP ...@@ -79,7 +76,7 @@ public class SaveCompanyFP extends SaveFP
{ {
process.setAttribute("IsHTLogoPresent", Boolean.FALSE); process.setAttribute("IsHTLogoPresent", Boolean.FALSE);
return new ProcessRedirectResult(hiringPage, new String[]{}); return new ProcessRedirectResult(nextPage, new String[]{});
} }
process.setAttribute("nextPage", nextPage); process.setAttribute("nextPage", nextPage);
......
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
...@@ -197,28 +197,24 @@ ...@@ -197,28 +197,24 @@
</span> </span>
<% <%
} }
// if(hiringTeam.getHiringTeamLogo() == null)
// {
// nextPage = WebUtils.getSamePageInRenderMode(request, "HiringTeam");
// }
Boolean isHTLogoPresent = (Boolean)process.getAttribute("IsHTLogoPresent"); Boolean isHTLogoPresent = (Boolean) process.getAttribute("IsHTLogoPresent");
if(isHTLogoPresent != null && isHTLogoPresent == Boolean.FALSE) if(CollectionUtils.equals(isHTLogoPresent, Boolean.FALSE))
{ {
process.setAttribute("IsHTLogoPresent",Boolean.TRUE); process.setAttribute("IsHTLogoPresent", Boolean.TRUE);
%> %>
<div id="overlay"> <div id="overlay">
<div class="modal-dialog welcome-pop-top"> <div class="modal-dialog welcome-pop-top">
<div class="modal-body main-welcome-popup"> <div class="modal-body main-welcome-popup">
<h2>The HT Logo is missing!</h2> <h2>You haven't added a logo yet!</h2>
<p>Please add a logo to your hiring team.</p>
<div class="create-y-f-job"> <div class="create-y-f-job">
<oneit:button value="Ok" name="saveCompany" skin="link" <oneit:button value="Ok" name="saveCompany" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", WebUtils.getSamePageInRenderMode(request, "Page")) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", WebUtils.getSamePageInRenderMode(request, "HiringTeam"))
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry("procParams", CollectionUtils.mapEntry("HiringTeam", hiringTeam).mapEntry("IsHTLogoPresent",Boolean.TRUE).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("HiringTeam", hiringTeam).mapEntry("IsHTLogoPresent",Boolean.TRUE).toMap())
.mapEntry("Company", company) .mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
.toMap() %>"> .toMap() %>">
</oneit:button> </oneit:button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment