This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit d5731824c2181531fb03c18b4bc76fc4b12a431f Author: Michael Brohl <[email protected]> AuthorDate: Fri Mar 13 17:35:45 2020 +0100 Implemented: Remove the user login security question. (OFBIZ-11244) Thanks Wiebke Pätzold for providing the patch. --- ecommerce/minilang/customer/CustomerEvents.xml | 8 -------- webpos/template/GetSecurityQuestion.ftl | 23 +---------------------- webpos/widget/CommonScreens.xml | 7 ------- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/ecommerce/minilang/customer/CustomerEvents.xml b/ecommerce/minilang/customer/CustomerEvents.xml index 60ba146..8b977b7 100644 --- a/ecommerce/minilang/customer/CustomerEvents.xml +++ b/ecommerce/minilang/customer/CustomerEvents.xml @@ -429,14 +429,6 @@ under the License. <set field="createProductStoreRoleMap.productStoreId" from-field="parameters.emailProductStoreId"/> <call-service service-name="createProductStoreRole" in-map-name="createProductStoreRoleMap"/> - <!--Create User Login Security Question if entered by the user--> - <if-not-empty field="parameters.SECURITY_ANSWER"> - <set field="createULSQCtx.userLoginId" from-field="parameters.USERNAME"/> - <set field="createULSQCtx.questionEnumId" from-field="parameters.securityQuestion"/> - <set field="createULSQCtx.answer" from-field="parameters.SECURITY_ANSWER"/> - <call-service service-name="createUserLoginSecurityQuestion" in-map-name="createULSQCtx" /> - </if-not-empty> - <!-- send off the registration email --> <if-not-empty field="emailContext.emailAddress"> <set from-field="parameters.emailProductStoreId" field="storeEmailLookup.productStoreId"/> diff --git a/webpos/template/GetSecurityQuestion.ftl b/webpos/template/GetSecurityQuestion.ftl index f6c30b7..ab8debc 100644 --- a/webpos/template/GetSecurityQuestion.ftl +++ b/webpos/template/GetSecurityQuestion.ftl @@ -20,37 +20,16 @@ under the License. <center> <div class="screenlet login-screenlet"> <div class="screenlet-title-bar"> - <#if securityQuestion?has_content> - <h3>${uiLabelMap.AnswerSecurityQuestion}</h3> - <#else> - <h3>${uiLabelMap.CommonForgotYourPassword}</h3> - </#if> + <h3>${uiLabelMap.CommonForgotYourPassword}</h3> </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>ForgotPassword_step3${previousParams?if_exists}</@ofbizUrl>" name="forgotpassword"> <table class="basic-table" cellspacing="0"> <#if userLoginId?has_content> - <#if securityQuestion?has_content> - <tr> - <td class="label">${uiLabelMap.SecurityQuestion}</td> - <td> - ${securityQuestion.description!} - <input type="hidden" name="securityQuestion" value="${securityQuestion.enumId!}" /> - <input type="hidden" name="USERNAME" value="${userLoginId!}" /> - </td> - </tr> - <tr> - <td class="label">${uiLabelMap.SecurityAnswer}</td> - <td> - <input type="text" name="securityAnswer" class="" value="" /> - </td> - </tr> - <#else> <tr> <td class="label">${uiLabelMap.CommonUsername}</td> <td><input type="text" size="20" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>" /></td> </tr> - </#if> <tr> <td colspan="2" align="center"> <input type="submit" name="GET_PASSWORD_HINT" class="smallSubmit" value="${uiLabelMap.CommonGetPasswordHint}" /> diff --git a/webpos/widget/CommonScreens.xml b/webpos/widget/CommonScreens.xml index 3539d7e..1c417d6 100644 --- a/webpos/widget/CommonScreens.xml +++ b/webpos/widget/CommonScreens.xml @@ -284,13 +284,6 @@ under the License. <section> <actions> <set field="userLoginId" from-field="parameters.USERNAME"/> - <entity-and entity-name="UserLoginSecurityQuestion" list="securityQuestions"> - <field-map field-name="userLoginId" /> - </entity-and> - <set field="questionEnumId" from-field="securityQuestions[0].questionEnumId" /> - <entity-one entity-name="Enumeration" value-field="securityQuestion"> - <field-map field-name="enumId" from-field="questionEnumId"/> - </entity-one> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
