-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Lpd 38816 v3 #2097
Lpd 38816 v3 #2097
Conversation
…ser is logged in and active
…n the user is logged in
The following guidelines have been set by the owner of this repository:
|
CI is automatically triggering the following test suites:
|
❌ ci:test:sf - 0 out of 1 jobs passed in 4 minutesClick here for more details.Base Branch:Branch Name: master Sender Branch:Branch Name: LPD-38816-evibuda-v3 1 Failed Jobs:For more details click here.format-source-files: [java] java.lang.Exception: Found 10 formatting issues: [java] 1: Rename variable "isAdminUser" to "adminUser": ./portal-web/docroot/html/portal/update_password.jsp 17 (Checkstyle:VariableNameCheck) [java] 2: There should be an empty line after line "17", see https://github.com/liferay/liferay-portal/blob/master/modules/util/source-formatter/src/main/resources/documentation/check/missing_empty_line_check.markdown: ./portal-web/docroot/html/portal/update_password.jsp 17 (Checkstyle:MissingEmptyLineCheck) [java] 3: Rename variable "isPasswordBlank" to "passwordBlank": ./portal-web/docroot/html/portal/update_password.jsp 26 (Checkstyle:VariableNameCheck) [java] 4: There should be an empty line after line "26", see https://github.com/liferay/liferay-portal/blob/master/modules/util/source-formatter/src/main/resources/documentation/check/missing_empty_line_check.markdown: ./portal-web/docroot/html/portal/update_password.jsp 26 (Checkstyle:MissingEmptyLineCheck) [java] 5: Missing parentheses, see https://github.com/liferay/liferay-portal/blob/master/modules/util/source-formatter/src/main/resources/documentation/check/if_statement_check.markdown: ./portal-web/docroot/html/portal/update_password.jsp 54 (SourceCheck:JSPParenthesesCheck) [java] 6: Redundant parentheses, see https://github.com/liferay/liferay-portal/blob/master/modules/util/source-formatter/src/main/resources/documentation/check/if_statement_check.markdown: ./portal-web/docroot/html/portal/update_password.jsp 54 (SourceCheck:JSPParenthesesCheck) [java] 7: ./portal-web/docroot/html/portal/init.jsp expected:<...portal.kernel.util.P[]rogressTracker" %><%...> but was:<...portal.kernel.util.P[aramUtil" %><%@ [java] page import="com.liferay.portal.kernel.util.P]rogressTracker" %><%...> [java] 8: ./portal-web/docroot/html/portal/update_password_title.jspf expected:<...0-2023-06 [java] */ [java] --%> [java] [java] [<div class="sheet-header"> [java] <div class="autofit-padded-no-gutters-x autofit-row"> [java] <div class="autofit-col autofit-col-expand"> [java] <h2 class="sheet-title"> [java] <liferay-ui:message key='<%= isPasswordBlank? "set-password" : "change-password" %>' /> [java] </h2> [java] </div> [java] [java] <div class="autofit-col"> [java] <%@ include file="/html/portal/select_language.jspf" %> [java] </div> [java] </div> |
Jenkins Build:test-portal-source-format#6885 Jenkins Report:jenkins-report.html Jenkins Suite:sf Pull Request:liferay-appsec#2097 Testray Routine:EE Pull Request Testray Build:[master] ci:test:sf - liferay-appsec > liferay-appsec - PR#2097 - 2024-12-02[02:55:52] Testray Build ID:81537788 Testray Importer:publish-testray-report#26225 |
ci:test:sf |
❌ ci:test:sf - 0 out of 1 jobs passed in 4 minutesClick here for more details.Base Branch:Branch Name: master Sender Branch:Branch Name: LPD-38816-evibuda-v3 1 Failed Jobs:For more details click here.format-source-files: [java] java.lang.Exception: Found 8 formatting issues: [java] 1: There should be an empty line after line "17", see https://github.com/liferay/liferay-portal/blob/master/modules/util/source-formatter/src/main/resources/documentation/check/missing_empty_line_check.markdown: ./portal-web/docroot/html/portal/update_password.jsp 17 (Checkstyle:MissingEmptyLineCheck) [java] 2: There should be an empty line after line "26", see https://github.com/liferay/liferay-portal/blob/master/modules/util/source-formatter/src/main/resources/documentation/check/missing_empty_line_check.markdown: ./portal-web/docroot/html/portal/update_password.jsp 26 (Checkstyle:MissingEmptyLineCheck) [java] 3: Missing parentheses, see https://github.com/liferay/liferay-portal/blob/master/modules/util/source-formatter/src/main/resources/documentation/check/if_statement_check.markdown: ./portal-web/docroot/html/portal/update_password.jsp 54 (SourceCheck:JSPParenthesesCheck) [java] 4: Redundant parentheses, see https://github.com/liferay/liferay-portal/blob/master/modules/util/source-formatter/src/main/resources/documentation/check/if_statement_check.markdown: ./portal-web/docroot/html/portal/update_password.jsp 54 (SourceCheck:JSPParenthesesCheck) [java] 5: ./portal-web/docroot/html/portal/init.jsp expected:<...portal.kernel.util.P[]rogressTracker" %><%...> but was:<...portal.kernel.util.P[aramUtil" %><%@ [java] page import="com.liferay.portal.kernel.util.P]rogressTracker" %><%...> [java] 6: ./portal-web/docroot/html/portal/update_password_title.jspf expected:<...0-2023-06 [java] */ [java] --%> [java] [java] [<div class="sheet-header"> [java] <div class="autofit-padded-no-gutters-x autofit-row"> [java] <div class="autofit-col autofit-col-expand"> [java] <h2 class="sheet-title"> [java] <liferay-ui:message key='<%= passwordBlank? "set-password" : "change-password" %>' /> [java] </h2> [java] </div> [java] [java] <div class="autofit-col"> [java] <%@ include file="/html/portal/select_language.jspf" %> [java] </div> [java] </div> [java] </div>]> but was:<...0-2023-06 [java] */ [java] --%> [java] [java] [ <div class="sheet-header"> [java] <div class="autofit-padded-no-gutters-x autofit-row"> [java] <div class="autofit-col autofit-col-expand"> [java] <h2 class="sheet-title"> |
Jenkins Build:test-portal-source-format#6888 Jenkins Report:jenkins-report.html Jenkins Suite:sf Pull Request:liferay-appsec#2097 Testray Routine:EE Pull Request Testray Build:[master] ci:test:sf - liferay-appsec > liferay-appsec - PR#2097 - 2024-12-02[03:35:45] Testray Build ID:81548304 Testray Importer:publish-testray-report#26228 |
If we only have 1 point where we are including a JSPF, then there is little benefit to splitting that out I think. |
This is because I have made a new pr with the same change but without using jspf - #2098 |
no following this approach |
The reason is that /pull/2098 should be a straight forward solution. |
move UI login to jsp and create jspf
add debault.admin.password logic