Skip to content
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

Closed
wants to merge 6 commits into from
Closed

Lpd 38816 v3 #2097

wants to merge 6 commits into from

Conversation

alvarosaugarlr
Copy link
Collaborator

@alvarosaugarlr alvarosaugarlr commented Dec 2, 2024

move UI login to jsp and create jspf
add debault.admin.password logic

@liferay-continuous-integration
Copy link
Collaborator

The following guidelines have been set by the owner of this repository:

  •     "Thank you for sending this PR to liferay-appsec! Here is the guide about 'How to send Pull Requests to the Application Security Team liferay-appsec'. For additional help,reach out in the #help-app-security Slack channel."

@liferay-continuous-integration
Copy link
Collaborator

CI is automatically triggering the following test suites:

  •     ci:test:sf

@liferay-continuous-integration
Copy link
Collaborator

❌ ci:test:sf - 0 out of 1 jobs passed in 4 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 038adf331615d04defca67065fc452207d955f0b

Sender Branch:

Branch Name: LPD-38816-evibuda-v3
Branch GIT ID: ae8b2c9ecd3a62b0c9f39f7c87f47186936dbf63

0 out of 1jobs PASSED
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>

@liferay-continuous-integration
Copy link
Collaborator

@alvarosaugarlr
Copy link
Collaborator Author

ci:test:sf

@liferay-continuous-integration
Copy link
Collaborator

❌ ci:test:sf - 0 out of 1 jobs passed in 4 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 038adf331615d04defca67065fc452207d955f0b

Sender Branch:

Branch Name: LPD-38816-evibuda-v3
Branch GIT ID: c2997d17090aa3d8e5778f23cf9a71f1566beb01

0 out of 1jobs PASSED
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">

@liferay-continuous-integration
Copy link
Collaborator

@stian-sigvartsen
Copy link
Collaborator

If we only have 1 point where we are including a JSPF, then there is little benefit to splitting that out I think.

@alvarosaugarlr
Copy link
Collaborator Author

This is because I have made a new pr with the same change but without using jspf - #2098

@alvarosaugarlr
Copy link
Collaborator Author

no following this approach

@stian-sigvartsen
Copy link
Collaborator

The reason is that /pull/2098 should be a straight forward solution.
The approach in this current PR could be developed further to make better use of JSPF (fragments) I think. But unless the other PR becomes more complex than currently envisaged, it does not make sense to do this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants